Commit Graph

240 Commits

Author SHA1 Message Date
Robin Ward 928e215e57 Update to latest Ember.js 2013-02-19 12:28:18 -05:00
Robin Ward ae9bee2a91 Merge pull request #172 from jeremybanks/master
Do not strip leading and trailing whitespace from raw posts
2013-02-19 08:15:39 -08:00
Robin Ward 8371ff058a Merge pull request #194 from tms/personal-space
Added restricted route to kick out trespassers on user routes
2013-02-19 08:08:18 -08:00
Sam Saffron d9531d94d5 basic lightbox support 2013-02-19 17:57:14 +11:00
Jeremy Banks d42782b318 Using LengthValidator's localized messages for StrippedLengthValidator. 2013-02-18 21:57:46 -05:00
Jeremy Banks eb2a5e4654 Merge branch 'origin/master'
Conflicts:
	lib/text_sentinel.rb
2013-02-18 21:41:20 -05:00
tms d2a2ccdb09 Added restricted route to kick out trespassers on user routes 2013-02-18 21:05:12 -05:00
Sam Saffron d520771c73 move stylesheet cache into the upload dir so its less crazy to sync across servers 2013-02-19 11:02:00 +11:00
Sam Saffron 3be7bde401 stop onebox rapid fire 2013-02-19 10:33:07 +11:00
Kevin Ansfield 1a81c90076 convert plain text in composer template to i18n 2013-02-18 11:20:07 +01:00
Sam Saffron b9698e8d2f fix loading message am message bus stuff 2013-02-18 19:37:12 +11:00
Sam Saffron 0e48e1c346 clean up git version stuff a tad 2013-02-18 18:01:36 +11:00
Sam 5265c0b790 Merge pull request #192 from tms/date-formatting
Use consistent date formatting in date helpers
2013-02-17 22:41:39 -08:00
Sam Saffron d9a84ddd01 chuck git version at the bottom of the page 2013-02-18 17:39:54 +11:00
tms 65d71f87a6 Use consistent date formatting in date helpers 2013-02-18 00:28:19 -05:00
Jeremy Banks 6af69f7e77 Do not strip leading and trailing whitespace from raw posts. 2013-02-15 20:58:33 -05:00
Sam Saffron 985b5c59c3 missing h3 2013-02-16 12:27:30 +11:00
Sam Saffron c81d07c44b clean up the topics footer so it does not flash and is localisable 2013-02-16 12:15:15 +11:00
Sam 8631a6850b Merge pull request #178 from danneu/update-stats-fix
Category year/month/week stats shouldn't include deleted topics.
2013-02-17 14:00:12 -08:00
Sam e8b3821b41 Merge pull request #179 from tms/users-like-like-posts
Users like like posts
2013-02-17 13:57:52 -08:00
Sam db66e9facc Merge pull request #181 from danneu/flags-i18n
added "flagged_by" i18n
2013-02-17 13:56:33 -08:00
Sam 1623197b05 Merge pull request #184 from tms/activity-stream-tweaks
Improved action descriptions/links on user stream items
2013-02-17 13:55:45 -08:00
Sam c7fba796b6 Merge pull request #185 from tms/search-all-the-things
Search all the things
2013-02-17 13:53:58 -08:00
tms 20c723c4fb Fancy 404 should require access too 2013-02-17 15:26:47 -05:00
Jeff Atwood fa9a2dda6d nav for /tos /privacy /faq pages, h2 anchors 2013-02-17 01:09:54 -08:00
tms 66d56a8b93 Correctly set the typeFilter when the user clicks "show more" 2013-02-17 02:21:49 -05:00
tms fb5710b5d6 Improved action descriptions/links on user stream items 2013-02-17 01:38:20 -05:00
Dan Neumann 72264e3034 added 'flagged_by' i18n. 2013-02-16 21:40:24 -06:00
Dan Neumann fac75401ef category stats shouldn't include deleted topics. 2013-02-16 21:10:18 -06:00
tms b7e392c7a3 Don't count bookmark stats for users who can't see them 2013-02-16 16:46:20 -05:00
tms b91ac45359 Avoid grouping user stats by archetype (filter happens beforehand) 2013-02-16 16:33:51 -05:00
Jeff Atwood cecbede5db add tooltip and better color to reply jump arrows 2013-02-16 13:07:14 -08:00
Robin Ward 9ca0615d94 Merge pull request #173 from dbarros/saved_preferences
Clear 'Saved' message when clicking Save button in user preferences.
2013-02-16 12:57:20 -08:00
Robin Ward 91ff0beb56 Merge pull request #177 from danneu/minor-fix
minor word change
2013-02-16 12:56:47 -08:00
Jeff Atwood 0d650972c2 add end nav footer to topic lists by category view 2013-02-16 12:27:24 -08:00
Dan Neumann 6dc088ca16 minor word change 2013-02-16 11:30:46 -06:00
Diego Barros 420614d50d Clear 'Saved' message when clicking Save button in user preferences. 2013-02-16 19:30:01 +11:00
Robin Ward b440e30f45 Better filtering out private messages on user stream. 2013-02-15 17:08:28 -05:00
Robin Ward fc1c120014 Arrows to navigate to embedded posts. 2013-02-15 15:17:57 -05:00
Robin Ward 5c4e6c9f2c Merge pull request #153 from xdite/refactor_topic_show_again
use helper again
2013-02-15 07:19:01 -08:00
Robin Ward 036e795e10 Merge pull request #152 from xdite/canonical-url
use canonical-url plugin to make view more clean
2013-02-15 07:18:41 -08:00
Robin Ward 3cdf89d052 Merge pull request #162 from jessepollak/omniauth-failure
Adds failure callback for omniauth
2013-02-15 07:13:17 -08:00
Jeff Atwood c1a50aae04 add more delete button styles on delete.. buttons 2013-02-15 01:45:37 -08:00
Jesse Pollak ad5a5b4866 This commit adds a callback route to handle omniauth failure and removes a few unneccessary entries in en.yml 2013-02-14 18:08:40 -08:00
Sam Saffron a8085f15c4 grab highest post number from the raw data, so deletions at the end of a topic work 2013-02-15 13:08:37 +11:00
Sam 9eb5c2a66a Merge pull request #163 from anthonyalberto/master
Fixes Issue #37 . Going to a user profile now updates the meta title.
2013-02-14 17:27:47 -08:00
Sam Saffron 6132373fab for some reason people seem to not understand why you can not submit close to empty posts, fix that 2013-02-15 12:20:17 +11:00
Sam Saffron c833e2f290 migrate to glyph notifications 2013-02-15 11:44:14 +11:00
Sam Saffron 9681cbb6b8 btn danger is a bit too loud there 2013-02-15 11:44:14 +11:00
Sam Saffron 6c73b3a971 bookmarks should only show up in a users stream 2013-02-15 11:44:14 +11:00