Commit graph

7942 commits

Author SHA1 Message Date
Régis Hanol
b2cb4b27a1 Merge pull request #2273 from paully21/development-branch
Add blurb of post to search results via API
2014-04-17 21:06:03 +02:00
Régis Hanol
bda47c2bf8 Merge pull request #2274 from vikhyat/badge-system
Fix user_badges n+1 query
2014-04-17 21:05:48 +02:00
Neil Lalonde
890e53cd6e Remove the default_invitee_trust_level+1 privilege from trust level 3. 2014-04-17 15:05:15 -04:00
Neil Lalonde
87e5e4b8d0 Use a real link to docker manager in new version email 2014-04-17 14:36:26 -04:00
Neil Lalonde
6c7863bbba Show installed version on dashboard after upgrade 2014-04-17 14:26:44 -04:00
Robin Ward
a57f802048 If there's a TopicEmbed record for a url, we don't have to crawl it.
This should help sites like Boing Boing where sometimes links are
crawled before saved in WordPress.
2014-04-17 14:00:22 -04:00
Robin Ward
ffc1634193 FIX: Only show link clicks on the title of a onebox, not repeatedly in
its body.
2014-04-17 13:01:44 -04:00
Robin Ward
87682f7539 FIX: Don't include image meta data when embedded in an email 2014-04-17 12:32:51 -04:00
Vikhyat Korrapati
843023d7c9 Fix user_badges n+1 query. 2014-04-17 21:58:05 +05:30
Robin Ward
b3ed8b6a32 Use query params for sortable table headings 2014-04-17 10:52:57 -04:00
Robin Ward
2eab288dc9 Port "Summarize Topic" to query-params-new 2014-04-17 10:46:33 -04:00
Robin Ward
fdb751296a FIX: ZALGO test suite was causing failures in the wrong place due to
missing `async` bits.
2014-04-17 10:46:33 -04:00
Robin Ward
617b4bed41 FIX: Rather than using singleton: false for avoiding caching in the
container, just unregister it afterwards.
2014-04-17 10:45:06 -04:00
Robin Ward
c9c95a9ac2 FIX: Ember doesn't allow one route name, basic, and Discourse used it! 2014-04-17 10:45:06 -04:00
Robin Ward
c820747ea3 FIX: Malformed HTML in templates 2014-04-17 10:45:06 -04:00
Robin Ward
fc65bc28be FIX: Use the container to register Discourse's custom location handler 2014-04-17 10:45:06 -04:00
Robin Ward
2f9bb6b88f FIX: Deprecation warnings on Ember.js for render without quotes. 2014-04-17 10:45:06 -04:00
Robin Ward
73cc722ed5 Update Ember.js, Handlebars and jQuery to latest 2014-04-17 10:45:06 -04:00
paully21
84d100be85 Add blurb of post to search results via API 2014-04-17 07:58:51 -05:00
Régis Hanol
a8011a5b63 Merge pull request #2272 from Onaldanm/upstream
Add badges class
2014-04-17 11:58:40 +02:00
Onaldanm
bf8d727a91 Add badges class
Add badges class to the container to custom this new page differently.
2014-04-17 11:40:06 +02:00
Sam
22b33871d5 Revert "update sidekiq"
This reverts commit d012906883.
2014-04-17 17:05:05 +10:00
Sam
d012906883 update sidekiq 2014-04-17 16:48:42 +10:00
Sam
30e73104e4 Bump up to 200 for now, UI perf needs lots of work 2014-04-17 16:25:06 +10:00
Sam
87f37b3ee9 Merge pull request #2271 from vikhyat/badge-system
Badge system updates
2014-04-17 16:22:41 +10:00
Sam
a92f839aaf Merge pull request #2267 from Supermathie/emailtest
Ghetto script to test if email settings work
2014-04-17 16:16:04 +10:00
Sam
087f78f8f0 Merge pull request #2265 from techAPJ/update-docker-guide
Add digital ocean guide link
2014-04-17 16:15:04 +10:00
Sam
50d65fc876 Merge pull request #2269 from vikhyat/username-on-top
Add username on top to CSS directory so it can be imported
2014-04-17 16:13:27 +10:00
Sam
ead7c52a06 Refactor demonizer in prep for unicorn forking
Upgrade sidekiq
2014-04-17 15:58:00 +10:00
Vikhyat Korrapati
b62606e7f1 Remove color_hexcode column from badge_types. 2014-04-17 05:36:29 +05:30
Robin Ward
a7c41e6512 Merge pull request #2270 from vikhyat/serialize-array-detection
Detect arrays for serialization using respond_to?(:to_ary)
2014-04-16 17:25:14 -04:00
Robin Ward
d4502070ed Merge pull request #2268 from vikhyat/poll-plugin
Get rid of unnecessary controller reference in poll template
2014-04-16 17:24:35 -04:00
Vikhyat Korrapati
89f45901bc Create notification when badge is granted. 2014-04-17 01:58:01 +05:30
Vikhyat Korrapati
b55734da91 Add badges tab to user profile. 2014-04-17 01:58:01 +05:30
Vikhyat Korrapati
3136217fc1 Add badge page. 2014-04-17 01:57:57 +05:30
Vikhyat Korrapati
8f53b7a65b Detect arrays for serialization using respond_to?(:to_ary).
This is the way AMS detects arrays, and is more robust than checking
is_a? for whitelisted classes. For example, this works for
ActiveRecord::AssociationRelation which the current logic does not
handle.
2014-04-16 20:48:09 +05:30
Neil Lalonde
1b4e11dec5 Version bump to v0.9.9.2 2014-04-16 11:14:38 -04:00
Neil Lalonde
abdfc2c7c1 Update translations 2014-04-16 10:42:21 -04:00
Neil Lalonde
1cddfd64c9 Add a flag to pull_translations.rb to force pull of all translations 2014-04-16 10:35:27 -04:00
Vikhyat Korrapati
acfcf0b64e Add /badges route that lists all defined badges. 2014-04-16 18:42:06 +05:30
Vikhyat Korrapati
de23caa871 Slightly faster badge system specs. (Shaves off ~100ms) 2014-04-16 18:08:10 +05:30
Vikhyat Korrapati
4c0f85650e Display badge count in the user admin page. 2014-04-16 18:08:10 +05:30
Vikhyat Korrapati
e0a4959dc9 Sort featured badges by badge type first, followed by grant count. 2014-04-16 18:08:10 +05:30
Vikhyat Korrapati
057c56ef9b Add user-badge component. 2014-04-16 18:08:00 +05:30
Jeff Atwood
ae2e1af123 Update README.md 2014-04-16 03:00:29 -07:00
Jeff Atwood
87e4541795 Update INSTALL.md 2014-04-16 02:54:12 -07:00
Jeff Atwood
1ff66421e7 Update INSTALL.md 2014-04-16 02:50:04 -07:00
Vikhyat Korrapati
a1333989f4 Add username on top to CSS directory so it can be imported. 2014-04-16 14:44:55 +05:30
Jeff Atwood
3b02257edb better admin quick start guide 2014-04-16 00:13:52 -07:00
Vikhyat Korrapati
11297efed5 Get rid of unnecessary controller reference in poll template. 2014-04-16 12:11:41 +05:30