Commit Graph

3449 Commits

Author SHA1 Message Date
Sam
0fee644434 Merge pull request #1191 from cfstras/patches
Fix bug: pressing enter on the "forgot password" modal does not submit the form
2013-07-15 03:18:23 -07:00
Sam
bf06be3260 Merge pull request #1189 from erlend-sh/patch-4
Update client.nb_NO.yml
2013-07-15 03:14:22 -07:00
Sam
8947d1aeac Merge pull request #1187 from stephankaag/refactor_array_concatenation
Refactor array concatenation
2013-07-15 03:13:44 -07:00
Sam
6f6ad9d076 Merge pull request #1186 from stephankaag/add_primary_keys
Add primary key `id` to `category_featured_topics` and `topic_users`
2013-07-15 03:12:07 -07:00
Sam
e57de7d4b9 Merge pull request #1188 from stephankaag/simplify_avatar_lookup
Simplify avatar lookup class
2013-07-15 03:11:34 -07:00
Sam
16976a2092 Merge pull request #1192 from cfstras/locale
Locales: updated German locale, mainly the admin section
2013-07-15 03:08:33 -07:00
Sam
86e5c9afc2 Merge pull request #1193 from jbruni/master
Tiny typo fix (comment at nginx.sample.conf)
2013-07-15 00:58:09 -07:00
Jeff Atwood
52fa9a5453 widen @name autocomplete dialog 20% 2013-07-15 00:42:02 -07:00
Jeff Atwood
906d1bc7c8 improve copy on daily action limit 2013-07-14 23:11:10 -07:00
Jeff Atwood
f46b619547 simplify copy around merge and split 2013-07-14 22:24:59 -07:00
Claus Strasburger
f92075f360 Locale german: got another one 2013-07-14 20:37:40 +02:00
Claus Strasburger
1d4abbe1fd Locales: updated German locale, admin content like the admin section and flagging 2013-07-14 20:11:07 +02:00
Erlend Sogge Heggen
542408550c v1 Complete translation for client.nb_NO.yml
All strings now have a first-take translation. Might have missed some due to the inconsistent use of double quotes, single quotes and no quotes (we're still good!).

I'm not entirely sure what happens when I apply edits to a still pending-for-pull patch; sorry if I goofed.
2013-07-14 14:16:17 +02:00
J Bruni
a42ed5d831 Fixed typo at nginx.sample.conf 2013-07-14 01:06:59 -03:00
Claus Strasburger
b5593daae1 Fix bug: pressing enter on the "forgot password" modal does not submit the form 2013-07-13 22:24:09 +02:00
Erlend Sogge Heggen
ac9cfe32f9 Update client.nb_NO.yml
Moar translations. Also jumped back and fixed what I could find of the ones with missing double quotes.
2013-07-13 20:47:11 +02:00
Stephan Kaag
9c243aa9ce Simplify avatar lookup class 2013-07-12 23:10:21 +02:00
Robin Ward
2aa487d2c8 Show who deleted a topic 2013-07-12 16:38:21 -04:00
Robin Ward
0c7ead339b Don't recalculate trustLevels combobox 2013-07-12 16:24:15 -04:00
Robin Ward
62d161fd70 Show number before trust level. Also use less memory for trust levels. 2013-07-12 16:18:32 -04:00
Robin Ward
35128c212b FIX: User page broke when the user had no stats 2013-07-12 15:59:35 -04:00
Stephan Kaag
f53ba6a3b0 Refactor array concatenation 2013-07-12 21:49:11 +02:00
Robin Ward
a43ed88699 Prefer your own topics in Suggested 2013-07-12 14:38:20 -04:00
Stephan Kaag
6dc9d3c411 Add primary key id to category_featured_topics and topic_users 2013-07-12 19:01:37 +02:00
Robin Ward
15a41a41f2 Use fancy formatting in the suggested topics list 2013-07-12 12:47:26 -04:00
Robin Ward
6122d31711 FIX: Jshint in computed.js - not in qunit? 2013-07-12 12:14:32 -04:00
Robin Ward
6ca5df0a09 Can recover deleted topics. Deleted topics show the first post as deleted in the UI. 2013-07-12 12:09:17 -04:00
Sam
f05bc44fbe Merge pull request #1182 from sanderdatema/dutch_translation
Dutch translation updated
2013-07-11 19:59:08 -07:00
Sam
00c6bffc61 Merge pull request #1183 from erlend-sh/patch-3
Update client.nb_NO.yml
2013-07-11 19:58:29 -07:00
Robin Ward
5eaae063f0 Discourse Macro Helpers + Minor Fix to Admin User View 2013-07-11 19:35:52 -04:00
Robin Ward
89152116c6 Only send digests to active users 2013-07-11 18:47:36 -04:00
Neil Lalonde
6c3c77df66 Version bump to v0.9.5 2013-07-11 17:26:14 -04:00
Robin Ward
bb5a9aa34b Remove reliance on views for logic, move to controller 2013-07-11 16:55:07 -04:00
Robin Ward
19c169540c Staff can enter and view deleted topics 2013-07-11 16:39:35 -04:00
Robin Ward
eba662b988 FIX: Topic Status Icons had weird margins after font awesome update 2013-07-11 12:04:39 -04:00
Robin Ward
4540a51a8f FIX: deleted_by wasn't showing up on refresh 2013-07-11 11:18:25 -04:00
Erlend Sogge Heggen
1976c622dc Update client.nb_NO.yml 2013-07-11 16:54:51 +02:00
Sander Datema
d4bc6f977b Dutch translation updated 2013-07-11 16:54:46 +02:00
Robin Ward
7fd8bb75d9 Merge pull request #1177 from ZogStriP/attachments
Attachments
2013-07-11 06:49:20 -07:00
Robin Ward
e826a55dc3 Merge pull request #1179 from iamjarvo/1176_update_install_email_guide
Update typo in documentation
2013-07-11 06:47:34 -07:00
Paritosh Piplewar
bb03e827d0 Update HEROKU.md
heroku has changed its default ruby version to 2.0.0 , now no need to write ruby version on top the of Gemfile. check https://blog.heroku.com/archives/2013/6/17/ruby-2-default-new-aps
2013-07-11 09:43:40 -04:00
Jearvon Dharrie
6a487f9a47 Update typo in documentation 2013-07-11 01:25:51 -04:00
Sam
33e2a9933d Merge pull request #1178 from royguo/patch-2
Update client.zh_CN.yml
2013-07-10 21:03:04 -07:00
Roy Guo
994f3d4ad5 Update client.zh_CN.yml
banned: "禁止参与讨论" # can't create or reply topics
blocked: "禁止登陆"   # can't login
2013-07-11 11:47:17 +08:00
Sam
1aef6de4b0 automatically approve invited users on forum where moderators must approve (keep in mind only moderators can invite)
speed up specs a touch
allow invite controller to accept an email in absence of user (cleans up API)
2013-07-11 11:22:00 +10:00
Neil Lalonde
7792b7da48 Use the solid envelope icon. Font-awesome swapped icon-envelope and icon-envelope-alt. 2013-07-10 17:06:07 -04:00
Régis Hanol
360695bb0a update front-end specs 2013-07-10 22:59:54 +02:00
Régis Hanol
b94d26d798 update back-end specs 2013-07-10 22:59:54 +02:00
Régis Hanol
6beb12e778 update nginx.sample.conf to take attachmetns into account 2013-07-10 22:59:54 +02:00
Régis Hanol
ac41e94619 refactor optimized_image a bit 2013-07-10 22:59:54 +02:00