Commit Graph

7467 Commits

Author SHA1 Message Date
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
David Czarnecki 481c0fc404 Use require: false for foreman gem 2014-03-18 22:06:10 -04: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 b7f2a3e512 VIM helper 2014-03-19 12:08:00 +11: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
Sam 7460e5ed24 BUGFIX: dupe topic names could booby trap seeding 2014-03-19 09:30:17 +11:00
David Czarnecki d71ec77737 Adding foreman gem to development group 2014-03-18 16:48:46 -04: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
Noel B. A 1cebbbc5e3 Poll - Spanish Translation 2014-03-18 21:36:04 +03:00
Robin Ward 5c6895c3e6 Merge pull request #2143 from czarneckid/patch-1
Minor fix for location of osx_dev script
2014-03-18 14:23:31 -04:00
David Czarnecki 05b923eac1 Minor fix for location of osx_dev script 2014-03-18 13:27:50 -04:00
Régis Hanol 5ce84eed82 Merge pull request #2134 from Onaldanm/patch-1
Poll - Topic Term
2014-03-18 17:42:43 +01:00
Régis Hanol a627a062de Merge pull request #2135 from Onaldanm/poll-badge-fr
Translation: Badges, poll and french updates
2014-03-18 17:41:06 +01:00
Régis Hanol a279ad06d9 Merge pull request #2142 from sanderdatema/patch-5
Dutch translation updated
2014-03-18 17:40:37 +01:00
Sander Datema 580a55ec03 Dutch translation updated 2014-03-18 11:47:50 +01:00
Sander Datema 5c0b6eaac1 Dutch translation updated 2014-03-18 11:46:47 +01:00
Godfrey Chan c6ed8f8587 Use sass-rails 4.0.2 2014-03-18 01:30:35 -07:00
Sam 5c26b3dad1 FIX: broken specs after new link alerting code 2014-03-18 15:22:53 +11:00
Sam 9fd7b0b814 use 1.9 syntax 2014-03-18 15:22:53 +11:00
Sam 76c7d42027 require rbtrace in development cause it is handy 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
Jeff Atwood 7a3eceed76 remove SSH key generation, not for beginners 2014-03-17 14:39:19 -07: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
Godfrey Chan 065615eb7b Upgraded rails to 4.0.4 2014-03-17 12:56:05 -07:00
Jeff Atwood 2cff3c20f7 clarify invite copy 2014-03-17 12:07:21 -07:00