Sam Saffron
0e48e1c346
clean up git version stuff a tad
2013-02-18 18:01:36 +11:00
Sam Saffron
87b929eac6
added secret token warning in prd
...
added task to stamp builds
2013-02-18 17:34:43 +11:00
Sam Saffron
1228e351a8
a much more basic but robust restart watcher,
...
removed the pid stuff cause it needs to be a lot more careful not to think
pids from other machines restarted. robust working code is better than
complex graceful broken code.
2013-02-16 13:54:23 +11:00
Sam Saffron
c81d07c44b
clean up the topics footer so it does not flash and is localisable
2013-02-16 12:15:15 +11:00
Sam Saffron
ff0d58e4ee
message bus work in progress
2013-02-16 12:14:52 +11:00
Sam
db66e9facc
Merge pull request #181 from danneu/flags-i18n
...
added "flagged_by" i18n
2013-02-17 13:56:33 -08:00
tms
fb5710b5d6
Improved action descriptions/links on user stream items
2013-02-17 01:38:20 -05:00
Dan Neumann
72264e3034
added 'flagged_by' i18n.
2013-02-16 21:40:24 -06:00
Robin Ward
3cdf89d052
Merge pull request #162 from jessepollak/omniauth-failure
...
Adds failure callback for omniauth
2013-02-15 07:13:17 -08:00
Sam Saffron
eb188c57e8
started work on message bus diags
2013-02-15 19:23:40 +11:00
Sam Saffron
89ff51e108
a stop gap so notifications do not look horrible
2013-02-15 19:22:25 +11:00
Jesse Pollak
ad5a5b4866
This commit adds a callback route to handle omniauth failure and removes a few unneccessary entries in en.yml
2013-02-14 18:08:40 -08:00
Sam Saffron
6132373fab
for some reason people seem to not understand why you can not submit close to empty posts, fix that
2013-02-15 12:20:17 +11:00
Jeff Atwood
e94b6e7796
rename nl.yml file as it's WIP
2013-02-14 16:50:16 -08:00
Jeff Atwood
bfd0b1ef29
add contributed nl.yml file
2013-02-14 16:43:51 -08:00
Sam Saffron
c833e2f290
migrate to glyph notifications
2013-02-15 11:44:14 +11:00
Jeff Atwood
0244834a97
copyedit on watching/tracking
2013-02-14 15:51:41 -08:00
Jeff Atwood
91e79670c4
copyedits on new user education panel
2013-02-14 15:32:06 -08:00
Robin Ward
b9457197c0
First stab at new user education - configurable messages that pop up on a user's first
...
few posts/topics.
2013-02-14 15:33:51 -05:00
Jeff Atwood
898efeaea2
suggested copy change to clarify grey unread old
2013-02-14 10:57:26 -08:00
Neil Lalonde
39eab7c425
Replace mentions of mothership with discourse_hub
2013-02-14 12:57:26 -05:00
Robin Ward
b94b9d2383
Merge pull request #146 from ismaelga/moderators-buttons
...
Create moderators
2013-02-14 07:26:50 -08:00
Sam Saffron
87d83802b9
added option that allows users to decide when they consider topics new (default 2 days old or newer)
...
added site_setting to control the default new_topic_duration_minutes
added 10 minutes option for auto_track_topics_after_msecs, default bumped up to 5 mins
2013-02-14 17:36:14 +11:00
Neil Lalonde
aaf96f1e29
Replace email_blacklist_regexp with email_domains_blacklist site setting
2013-02-13 22:45:43 -05:00
Jeff Atwood
d9d2565c25
remove extra text in login error
2013-02-13 17:23:30 -08:00
Ismael Abreu
80bec6efc9
Adds grant and revoke moderation buttons so admins can make users moderators
2013-02-14 01:12:23 +00:00
Sam Saffron
fd694e7b83
Merge branch 'master' of github.com:discourse/discourse
2013-02-14 09:12:49 +11:00
Sam Saffron
4ccb7354d1
nuking SSL = bad
2013-02-14 09:12:20 +11:00
Robin Ward
4c6379ea56
New users are highlighted when posting. .new-user class
2013-02-13 16:12:30 -05:00
Neil Lalonde
f850fe1e75
Implement the email_blacklist_regexp ssite setting
2013-02-13 12:28:39 -05:00
Robin Ward
4aa89ed2c0
Merge pull request #156 from kubabrecka/correct_typos
...
correcting some typos in locales/en.yml
2013-02-13 07:26:28 -08:00
Robin Ward
81f34349a7
Merge pull request #143 from pixelcort/ninja_edit_window_clarification
...
Clarify the unit of time for ninja_edit_window
2013-02-13 07:24:41 -08:00
Robin Ward
afc23cc8cb
Merge pull request #133 from xdite/apply_omniauth
...
Apply omniauth
2013-02-13 07:19:13 -08:00
Kuba Brecka
1b5aaa1a7b
correcting some typos in locales/en.yml
2013-02-13 16:16:40 +01:00
Sam Saffron
b7c5687b10
Merge branch 'master' of github.com:discourse/discourse
2013-02-13 20:38:59 +11:00
Sam Saffron
161420fac0
Added method for testing ember stuff
...
Collapse user actions in UI so it stops looking crazy
Removed dud dupe user action TOPIC_RESPONSE
Always show the owner of a post on the user page, actions by others at the bottom
2013-02-13 20:38:43 +11:00
Jeff Atwood
e380ebde40
no uppercasin'
2013-02-13 01:20:02 -08:00
xdite
67cc766f0c
using redis as backend store
2013-02-13 16:48:44 +08:00
Jeff Atwood
1a0ead770e
add base_url to all /faq links in emails
2013-02-12 23:33:35 -08:00
xdite
a7908e07d1
merge master
2013-02-13 15:16:39 +08:00
xdite
9189d937f7
move all logic to omniauth
...
implement omniauth-facebook / omniauth-twitter
2013-02-13 15:08:38 +08:00
xdite
be3d036084
use omniauth-openid to replace google id
2013-02-13 15:08:32 +08:00
Jeff Atwood
36165d4687
copyedits
2013-02-12 22:20:53 -08:00
Robin Ward
d7f3241285
Option to supress replies button below a post, when its reply is directly following.
2013-02-12 14:35:21 -05:00
Cortland Klein
9ce896840c
Clarify the unit of time for ninja_edit_window
2013-02-12 11:17:11 -08:00
Robin Ward
be9c374285
Oops, database.yml and redis.yml were still included
2013-02-12 11:32:32 -05:00
Robin Ward
3875806315
Introduction of Chef to Vagrant. Removed redis.yml and database.yml. Also updated
...
instructions a lot, and included setup instructions for provisioning your own VM.
Closes #28 and #61 .
2013-02-12 11:18:59 -05:00
Sam Saffron
ad88487a32
Merge branch 'master' of github.com:discourse/discourse
2013-02-12 13:45:24 +11:00
Sam Saffron
2609350457
sample bluepill config
2013-02-12 13:44:44 +11:00
Jeff Atwood
ecbaa45736
remove extraneous text on PM summary
2013-02-11 16:14:44 -08:00