Commit Graph

3961 Commits

Author SHA1 Message Date
Robin Ward 52fbce07ed Add emoji style for blogs 2014-03-19 17:51:41 -04:00
Robin Ward faaada6e8a Consider URLs the same even with a trailing slash 2014-03-19 16:33:21 -04:00
Robin Ward d3f1eb395d Updated import for TypePad 2014-03-19 15:02:49 -04:00
Régis Hanol 44888f7acc FEATURE: upload button on mobile composer 2014-03-19 18:34:08 +01:00
Neil Lalonde a74764c833 Log when facebook doesn't provide an email address 2014-03-19 13:31:17 -04:00
Robin Ward 51e3d72461 Merge pull request #2141 from riking/correctness
Lots of JS correctness fixes
2014-03-19 11:20:15 -04:00
Neil Lalonde a9a8e649ba Oops, and these methods too 2014-03-19 10:36:24 -04:00
Neil Lalonde 986f6e9c2a Oops I meant to delete the old method 2014-03-19 10:35:35 -04:00
Neil Lalonde 3ea477b17d FIX: performance of CategoryDetailedSerializer and Category.update_stats on large databases 2014-03-19 10:14:15 -04:00
Jeff Atwood 42ea20b439 get rid of borders around mobile glyphs 2014-03-19 07:02:09 -07:00
Jeff Atwood e67ad58a8d Merge pull request #2149 from awesomerobot/master
removing border from topic list, making category sizes consistent
2014-03-19 06:45:06 -07:00
Kris Aubuchon c11965ed9f removing border from topic list, making category sizes consistent 2014-03-19 09:38:35 -04:00
Régis Hanol 80bfdeee82 Merge pull request #2147 from vikhyat/serialize-params
Route `serialize` hook argument is the model, not params
2014-03-19 09:30:26 +01:00
Vikhyat Korrapati 28731ea633 Route `serialize` hook argument is the model, not params. 2014-03-19 12:02:27 +05:30
Sam eab30d1c28 Merge pull request #2146 from vikhyat/badge-system
Badge creation UI improvements
2014-03-19 17:11:00 +11:00
Vikhyat Korrapati 89d3835d64 Badge creation UI improvements. 2014-03-19 10:43:38 +05:30
Vikhyat Korrapati a4461022a3 Move badges admin tab to after users, show only if enabled. 2014-03-19 09:48:04 +05:30
riking 4699136d83 Fix this/self usage warning
To clarify the intent of using 'this' inside the closure, it is first assigned to a variable.
2014-03-18 19:09:49 -07:00
riking 8136468ec7 Fix inefficent jQuery usage
Some jQueries can be cached and reused. This commit does that.
2014-03-18 19:09:49 -07:00
riking a871158c80 Fix some bad HTML 2014-03-18 19:09:49 -07:00
riking 2ade638d79 Remove unused variables 2014-03-18 19:09:44 -07:00
riking 834a721bbe Remove two noop backslashes in regexes 2014-03-18 18:24:36 -07:00
riking 86774fa5c1 Simplify return statements 2014-03-18 18:23:15 -07:00
riking 3f35d1062e Remove trailing commas, add trailing semicolons 2014-03-18 18:21:10 -07:00
riking 593f5df503 Corrections to JSDoc 2014-03-18 18:19:20 -07:00
Sam 9fc31932cf BUGFIX: don't alery myself when I link to myself 2014-03-19 12:07:48 +11:00
Régis Hanol 5bc8e7c19b BUGFIX: BackupChunksMerger
- actually remove the tmp directory
- merge all the chunks into a .tmp archive and then remove the .tmp extension once done
2014-03-19 01:05:47 +01:00
Régis Hanol a2483b95df BUGFIX: stabilize the buttons in revision history UI 2014-03-19 00:36:02 +01:00
Sam b77fe49150 Stop leaking site_email in rss 2014-03-19 09:46:48 +11:00
Robin Ward 84e608079b Ability to customize the logo in digest emails 2014-03-18 15:56:17 -04:00
Robin Ward d0edfe2179 Better error messages if the "Send Test Email" button fails. 2014-03-18 15:26:36 -04:00
Neil Lalonde fa4bc90fbb Remove another N+1 query from categories page 2014-03-18 15:24:29 -04:00
Neil Lalonde 0b1550f9d4 Add excerpt column to topics table to remove N+1 query in ListableTopicSerializer 2014-03-18 15:24:29 -04:00
Robin Ward 3cf0adaed0 Merge pull request #2139 from riking/s3-backup-warning
Add s3_backup_config_warning
2014-03-18 14:41:42 -04:00
Sam 5c26b3dad1 FIX: broken specs after new link alerting code 2014-03-18 15:22:53 +11:00
Sam 00a46253ae BUGFIX: Don't resolve oneboxes when cooking
Defer to post save job
2014-03-18 15:22:53 +11:00
Sam 24667cedee FEATURE: notify users when linked
Extract out PostAlerter from observer
Track outgoing post links correctly
Notify users they are linked when linked
2014-03-18 15:22:53 +11:00
Jeff Atwood 02bed953b3 Merge pull request #2140 from awesomerobot/master
fixing private category badges and mobile header logo
2014-03-17 21:08:40 -07:00
Kris Aubuchon fd2da91df0 fixing private category badges and mobile header logo 2014-03-17 23:18:15 -04:00
Kris Aubuchon 49a222f985 fixing private category badges and mobile header logo 2014-03-17 23:00:39 -04:00
riking ffd4f367e3 Add s3_backup_config_warning
Note that only one of the two warnings can be shown, because they are checked in the same method.
2014-03-17 12:56:59 -07:00
Neil Lalonde 2c725e2779 FEATURE: Trust level 4 abilities: pin/unpin, close, archive, make invisible, split/merge topic 2014-03-17 14:50:28 -04:00
Neil Lalonde f390c92578 Hide the Invite button in topics in secured categories 2014-03-17 10:59:15 -04:00
Régis Hanol 26578d1b73 Merge pull request #2137 from vikhyat/badge-system
Fix badge description i18n match
2014-03-17 14:57:03 +01:00
Vikhyat Korrapati 4f71256542 Fix badge description i18n match. 2014-03-17 18:43:09 +05:30
Benjamin Kampmann e63b9b362e allow apps to give custom admin javascripts 2014-03-17 13:19:08 +01:00
Régis Hanol 2085c82360 Merge pull request #2132 from vikhyat/firefox-paste-image
Support image copy-paste for Firefox 24+
2014-03-17 09:29:31 +01:00
Sam 02963b03dc BUGFIX: last_seen_at can be nil 2014-03-17 12:42:51 +11:00
Sam fe63db7953 Merge pull request #2115 from vikhyat/badge-system
Initial badge system implementation
2014-03-17 10:06:37 +11:00
Sam f4c2fef407 Merge pull request #2121 from LessonPlanet/disable-name-edit-for-sso
Adding name to the list of uneditable items in preferences UI
2014-03-17 10:05:11 +11:00