Commit Graph

1762 Commits

Author SHA1 Message Date
Sam 9a5706241b Merge pull request #714 from wojciechka/master
Fix for notifications not being shown when running with prefix
2013-04-16 03:21:14 -07:00
Wojciech Kocjan 8a63b46adc Fix for notifications not being shown when running with prefix 2013-04-16 11:46:16 +02:00
Sam 3bc4aefe87 fix double include 2013-04-16 18:43:07 +10:00
Sam 1d4b69332c missing file from gemfile lock 2013-04-16 10:43:51 +10:00
Jeff Atwood 8e9b34d6cd remove "sent you a PM' text from the notify area 2013-04-15 17:38:39 -07:00
Sam 31c5ad2328 Merge pull request #709 from ZogStriP/automatically-resize-images
automatically resize images
2013-04-15 17:38:27 -07:00
Sam 033085bb2c Merge pull request #713 from ZogStriP/generate-api-key-not-working
FIX: generate API key not working
2013-04-15 15:19:08 -07:00
Régis Hanol f64de0c41e FIX: generate API key not working 2013-04-16 00:04:12 +02:00
Régis Hanol c2e58b61c9 automatically resizes images 2013-04-15 23:32:26 +02:00
Sam 97ba06d954 Merge pull request #710 from ZogStriP/email-is-case-sensitive
better consistency around email case sensitivity
2013-04-15 14:10:32 -07:00
Jeff Atwood bb586ec1a9 indicate use_ssl not implemented, experimental 2013-04-15 13:56:16 -07:00
Neil Lalonde c6ab9fec9d Unregister forum membership at Discourse Hub when deleting a user 2013-04-15 14:52:07 -04:00
Neil Lalonde 56c858e58b Use transaction around deleting a user and logging that action 2013-04-15 11:39:30 -04:00
Neil Lalonde f30a74c4f6 Fix version check when your version is later than the one fetched by the last version check job 2013-04-15 11:00:29 -04:00
Jeff Atwood fb010727d1 user != person 2013-04-15 01:20:30 -07:00
Jeff Atwood 420bd37268 copyedits on notify flag options 2013-04-15 01:09:38 -07:00
Sam ca1473d512 jshint file based on our yaml ... we really should centralize this 2013-04-15 15:39:05 +10:00
Sam dec6b9970a guard failed me 2013-04-15 15:37:31 +10:00
Sam e98ee42473 new ignore in jshint 2013-04-15 15:21:00 +10:00
Sam f314e7a89c make source git pull freindly, no need to copy files around when updating 2013-04-15 15:07:40 +10:00
Sam ea3c6d2e6f fix jshint 2013-04-15 13:18:26 +10:00
Sam 2bdb53261b don't treat notify user as a flag 2013-04-15 13:09:52 +10:00
Sam 034513f0fa Merge pull request #711 from snapapps/patch-2
Honestly, MEMORIES?
2013-04-14 18:57:19 -07:00
Ian Carroll 1d1d85ed40 Honestly, MEMORIES? 2013-04-14 22:46:36 -03:00
Sam 5b4fa68e8c Merge pull request #705 from wpp/refactor_users_controller
Refactor user controller, create action, mostly.
2013-04-14 18:40:19 -07:00
Sam fded1dfbe8 Merge pull request #708 from sanderdatema/dutch_translation
Dutch translation
2013-04-14 18:37:37 -07:00
Régis Hanol b24c1a1ad9 better consistency around email case sensitivity 2013-04-15 02:20:33 +02:00
Sander Datema 481a224ff9 Small edits to Dutch translation (client side) to make it sound more natural 2013-04-14 22:23:30 +02:00
Sander Datema 7965dadf7a Updated Dutch translation (client side) to latest Discourse version 2013-04-14 21:28:41 +02:00
Jeff Atwood 00d0072d2d make ToS clear that USA stuff applies to USA only 2013-04-14 12:12:04 -07:00
Jeff Atwood c9c736068d fix ToS so paid upgrades are shown as optional 2013-04-14 12:06:05 -07:00
Sander Datema 35971506fd Updated Dutch translation (client side) to latest Discourse version 2013-04-14 20:48:16 +02:00
Sander Datema 2af902f4d1 Merge branch 'master' of https://github.com/discourse/discourse into dutch_translation 2013-04-14 20:46:00 +02:00
Sander Datema f47f880f8b Updated Dutch translation (client side) to latest Discourse version 2013-04-14 20:44:59 +02:00
Jeff Atwood a1d7f24240 improve "override default" text in customize 2013-04-14 11:22:25 -07:00
Jeff Atwood c4a0cf6517 Merge pull request #707 from tangramor/master
Update the zh_CN and zh_TW translations to the latest en.yml
2013-04-13 09:35:02 -07:00
Jeff Atwood 6a90ef7cf0 Merge pull request #706 from ZogStriP/keep-french-l10n-up-to-date-2013-04-12
keep French l10n up to date
2013-04-13 09:34:42 -07:00
tangramor 344a744f3a Updated zh_CN & zh_TW translations to the latest en.yml 2013-04-13 10:51:54 +08:00
Régis Hanol efa9117f21 keep French l10n up to date 2013-04-13 02:16:02 +02:00
Sam 5bca572321 Merge pull request #701 from lsdafjklsd/patch-1
Fixed typo
2013-04-12 16:06:50 -07:00
Sam 13adbf6f72 Merge pull request #702 from ZogStriP/keep-french-l10n-up-to-date-2013-04-11
keep French l10n up to date
2013-04-12 16:06:18 -07:00
Philipp Weissensteiner 3dcb1905e3 Refactor user controller, create action, mostly.
The gist of the commit are a few improvements in the
create action, where:

* long boolean statemenst have been wrapped in smaller more readable
  methods.
* the 3rd party user info creation has been extracted (still in controller)
* a small helper method for creating a new user from params (to reduce
  visual clutter)
* specs have been added where I came across untested methods/branches

Other changes are more trivial like formatting and whitespace fixes.
Hope this helps. Regards.
2013-04-13 00:53:59 +02:00
Neil Lalonde 7bc80ea525 Oops i broke jshint again 2013-04-12 18:13:58 -04:00
Neil Lalonde 48d5cb02c2 Add email as a sharing option 2013-04-12 18:06:36 -04:00
Neil Lalonde 4413d2a92b Version bump to v0.8.6 2013-04-12 16:55:24 -04:00
Neil Lalonde 651cfba93f Add ability to destroy a user with 0 posts 2013-04-12 16:53:00 -04:00
Sam 8014d7fd25 correct rack::cache so it always punches through users with auth cookies 2013-04-12 21:59:52 +10:00
Sam 1725bf77a7 fix build 2013-04-12 21:09:41 +10:00
Sam 5551ef9418 ok I should not be coding to a deadline ... grrr 2013-04-12 18:15:19 +10:00
Sam 86b317ea73 oops 2013-04-12 18:14:36 +10:00