Commit Graph

7499 Commits

Author SHA1 Message Date
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 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 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 from Onaldanm/patch-1
Poll - Topic Term
2014-03-18 17:42:43 +01:00
Régis Hanol a627a062de Merge pull request 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 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 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
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
Robin Ward 5b0d8d5ffd Trivial typo 2014-03-17 13:13:05 -04:00
Robin Ward 38f2c778fb Update ember-cloaking for latest fixes/tweaks 2014-03-17 12:01:17 -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 from vikhyat/badge-system
Fix badge description i18n match
2014-03-17 14:57:03 +01:00
Régis Hanol 3fb7d0c3f8 Merge pull request from ligthyear/plugins-admin-js
Enable Admin-Javascript for plugins
2014-03-17 14:33:56 +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
Sébastien Miquerolle 1f71a4d4bc Poll - Topic Term
Use topic instead of thread to keep the same term for the user.
2014-03-17 11:27:41 +01:00
Onaldanm 134af37cbd Badges, poll and french Translation
New Badges system
New string in the poll plugin + change the term "poll option"
Re-add some empty strings (like notifications.title)
And updates
2014-03-17 11:21:47 +01:00
Régis Hanol 2d49374357 Merge pull request from nbalonso/spanish-translation
updated spanish translation
2014-03-17 09:31:17 +01:00
Régis Hanol 2085c82360 Merge pull request from vikhyat/firefox-paste-image
Support image copy-paste for Firefox 24+
2014-03-17 09:29:31 +01:00
Régis Hanol 473c054070 Merge pull request from Aselox/master
Update Italian Translation
2014-03-17 09:29:10 +01:00
Sam 798b8444cf BUGFIX: work correctly if process forks 2014-03-17 15:22:11 +11:00
Sam 90139efc6f Fix spec, remove pointless have_many etc preamble 2014-03-17 12:47:47 +11:00
Sam 02963b03dc BUGFIX: last_seen_at can be nil 2014-03-17 12:42:51 +11:00
Sam 2c8ae22b87 FEATURE: add a simple queue Scheduler::Defer.later {}
For quick jobs that do not need to be sent to sidekiq,
runs inline in a single thread but does not block
2014-03-17 12:16:19 +11:00
Aselox 9a8dff1d32 Update server.it.yml 2014-03-17 00:26:45 +01:00