Commit graph

7192 commits

Author SHA1 Message Date
Sam
91aa21671a Merge pull request #2116 from LessonPlanet/disable-name-edit-for-sso
Adding name to the list of uneditable items in preferences UI
2014-03-13 13:53:59 +11:00
Sam
f19596af0d update sass 2014-03-13 13:12:12 +11:00
Sam
25bbeaf09c mini profiler update 2014-03-13 13:11:13 +11:00
Jeff Atwood
aea608c81c simplify version number display a bit 2014-03-12 17:13:39 -07:00
Forest Carlisle
e8c7c6fab7 Adding name to the list of uneditable items in preferences UI
* If enable_names,  enable_sso, and sso_overrides_name settings are true.
2014-03-12 17:09:53 -07:00
Neil Lalonde
5f34a621b5 Revert "Merge pull request #1896 from nickborromeo/category-list" 2014-03-12 16:41:15 -04:00
Robin Ward
085f7997a2 FEATURE: Upload backups to S3 when complete. 2014-03-12 16:24:45 -04:00
Neil Lalonde
3175c85fa6 FIX: pin/unpin button in topic admin menu needs to ignore whether the admin user cleared the pin 2014-03-12 14:47:15 -04:00
Robin Ward
42ca83ece5 FEATURE: New site setting to enable a daily automatic backup 2014-03-12 13:30:47 -04:00
Neil Lalonde
9ca516e58d Rename nickname to username in the code. Use new hub routes. (Old routes still exist as aliases for old Discourse instances.) 2014-03-12 12:39:36 -04:00
Robin Ward
dc1d6decf5 Support for removal of old backups automatically via a site setting 2014-03-12 12:24:35 -04:00
Neil Lalonde
cf630207b7 Remove an unused variable in check_reviving_old_topic spec 2014-03-12 10:46:50 -04:00
Neil Lalonde
659e7fa4ce FEATURE: Warn when reviving a topic that has been inactive for X days. Setting warn_reviving_old_topic_age controls when the warning is shown. Set it to 0 to disable this feature. 2014-03-12 10:44:12 -04:00
Benedikt Lang
b7315cfc05 German translation updated (client) 2014-03-12 14:18:13 +01:00
Régis Hanol
363fabd3e7 add tests for ListController.best_period_for 2014-03-12 12:58:41 +01:00
Régis Hanol
5b7f2b4488 ooops. I don't know how to write smtp 2014-03-12 11:55:08 +01:00
Régis Hanol
c5298cd25f BUGFIX: require net/stmp module to properly handle exceptions 2014-03-12 11:53:10 +01:00
Régis Hanol
8c89931747 do not log sensitive commands during backup/restore 2014-03-12 11:45:55 +01:00
Régis Hanol
2735f286c4 UI: add calendar icon to all top buttons 2014-03-12 11:34:01 +01:00
Régis Hanol
bbde2aaa97 Merge pull request #1896 from nickborromeo/category-list
Refactor find_relevant_topics and find_categories
2014-03-12 09:44:41 +01:00
Nick Borromeo
5104c7365f Refactor find_relevant_topics and find_categories
This breaks down two private methods into smaller methods for
readability. This also moves logic into the Category model class.
2014-03-11 22:16:13 -07:00
Jeff Atwood
55c2a329f3 Merge pull request #2110 from awesomerobot/master
going back to the white on blue new post notification badges
2014-03-11 15:10:50 -07:00
Kris Aubuchon
441d01c5a6 going back to the white on blue new post notification badges 2014-03-11 17:26:25 -04:00
Robin Ward
1b1c213c61 Remove ember-renderspeed JS file 2014-03-11 16:15:41 -04:00
Régis Hanol
5ffcfb1a8c TRIVIAL: remove useless condition 2014-03-11 19:06:36 +01:00
Régis Hanol
aece2b61a9 FIX: revision history UI 2014-03-11 18:51:26 +01:00
Neil Lalonde
380a894222 Revert "update sass, cause compilation of css is getting really slow". Getting "RuntimeError: can’t modify frozen object" when logged in as admin. 2014-03-11 11:30:41 -04:00
Sam
cff7d12419 update sass, cause compilation of css is getting really slow 2014-03-12 01:05:53 +11:00
Régis Hanol
9eb3958374 FEATURE: gzip backups using best compression 2014-03-11 12:47:51 +01:00
Régis Hanol
80911b92d0 Merge pull request #2109 from vikhyat/poll-plugin
Add a test to make sure the poll prefix translation can be a regex
2014-03-11 12:40:55 +01:00
Régis Hanol
8b6930a5cf FIX: shortDate tests 2014-03-11 12:37:54 +01:00
Régis Hanol
f8bf0fbad8 FIX: encoding on FR translations 2014-03-11 12:30:59 +01:00
Vikhyat Korrapati
0950dde8d0 Add a test to make sure the poll prefix translation can be a regex. 2014-03-11 16:54:12 +05:30
Régis Hanol
249e577456 Merge pull request #2108 from Onaldanm/plugin-poll-fr
Poll - French Translation
2014-03-11 12:03:56 +01:00
Onaldanm
2a9939cf15 Poll - French Translation
French translation for the plugin Poll
2014-03-11 11:55:36 +01:00
Régis Hanol
a17310276f Merge pull request #2107 from riking/change-date-format
Switch from MMM D to D MMM to separate from year
2014-03-11 11:42:55 +01:00
riking
c29c15a7a3 Switch from MMM D to D MMM to separate from year
Additionally, in German, the format is 'D. MMM'.
2014-03-11 03:28:13 -07:00
Régis Hanol
ad45fdaed7 Merge pull request #2106 from vikhyat/firefox-paste-image
Set canvas height and width for Firefox image copy-paste
2014-03-11 11:07:21 +01:00
Vikhyat Korrapati
2e4a699b30 Set canvas height and width for Firefox image copy-paste. 2014-03-11 15:29:44 +05:30
Régis Hanol
d25081ce07 Merge pull request #2104 from nschonni/additional-jshinting
Additional jshinting
2014-03-11 09:20:04 +01:00
Régis Hanol
7e9cf618f5 Merge pull request #2105 from nschonni/add-editorconfig
Add EditorConfig to enforce spacing
2014-03-11 09:19:29 +01:00
Régis Hanol
f71846f269 Merge pull request #2103 from awesomerobot/master
fixing the remnant borders left on the header buttons
2014-03-11 09:11:32 +01:00
Nick Schonning
3c2e04c50b Add EditorConfig to enforce spacing
Will automatically use the correct indenting and trim line endings on
supported IDEs.
2014-03-11 03:59:30 -04:00
Nick Schonning
9f8d608a8d JSHint headless-ember
- Mark all exported vars
- Mark redefined global vars
- Suppress leak warning for the redefinition of jQuery
2014-03-11 03:18:57 -04:00
Nick Schonning
3782fbed2b JSHint run-qunit.js
- Turn on devel for console and phantom for the phantomjs globals
- Remove unnecessary semicolons
- Use strict comparisons
- Add missing var statements used by for…in
2014-03-11 03:10:55 -04:00
Nick Schonning
635c0dbf7a JSHint i18n.js
- Mark the I18n object as an overridable global
- Normalize comma first style rather than turning on lax comma
- Add missing semicolons
- Remove unnecessary semicolons
- Fix options overloading in “lookup”
- Use strict comparison for typeof checks and remove unnecessary parens
2014-03-11 03:01:12 -04:00
Jeff Atwood
7482f07eaa reduce undocked header title font size slightly 2014-03-10 23:55:30 -07:00
Nick Schonning
62d5a10873 JSHint test helpers
Remove unreferenced globals
2014-03-11 02:40:27 -04:00
Nick Schonning
86a9e0db6a JSHint assertions.js
Mark all functions as exported
2014-03-11 02:36:10 -04:00
Nick Schonning
054eca840a JSHint parse_html.js
- Mark Tautologistics as a global
- Mark parseHTML as exported
2014-03-11 02:34:17 -04:00