Commit Graph

4161 Commits

Author SHA1 Message Date
Sam
3cffdb5a65 Merge pull request #1382 from novemberkilo/master
No more rails 4 deprecation warnings
2013-08-25 17:09:49 -07:00
Navin Keswani
d87389b38e No more rails 4 deprecation warnings 2013-08-25 23:18:11 +02:00
Jeff Atwood
7f185b6a6f Merge pull request #1380 from ZogStriP/fix-changing-another-user-avatar-changes-your-not-theirs
FIX: changing another user's avatar changes yours
2013-08-25 11:33:22 -07:00
Régis Hanol
fd7fd22932 FIX: changing another user's avatar changes yours 2013-08-25 17:33:43 +02:00
Robin Ward
b32e87c929 Merge pull request #1377 from ZogStriP/avatar-work
Improved specs for avatar + added a warning whenever the uploaded image is not a square
2013-08-25 07:30:34 -07:00
Robin Ward
b74754e673 Merge pull request #1371 from einarj/cleanup_user_registration
Extracted nickname registration into a private controller method
2013-08-25 07:30:10 -07:00
Robin Ward
e1efde6707 Merge pull request #1376 from gcapizzi/lists_controller_refactoring
ListController refactoring
2013-08-25 07:29:35 -07:00
Robin Ward
89421088e5 Merge pull request #1379 from abbat/master
Russian translation (actual version)
2013-08-25 07:28:38 -07:00
Robin Ward
9e32baa357 Merge pull request #1375 from versvs/master
Added strings
2013-08-25 07:28:10 -07:00
Anton Batenev
bad2f7bb24 Russian translation (actual version) 2013-08-25 17:19:03 +04:00
Régis Hanol
4c788e75f0 add a warning whenever the uploaded image is not a square 2013-08-25 00:25:47 +02:00
Robin Ward
c0b051c9f6 Show Private Messages pill as a topic list rather than individual messages. 2013-08-24 16:58:16 -04:00
Régis Hanol
3b9e62e6b9 improved specs for avatar 2013-08-24 22:45:05 +02:00
Robin Ward
2ce59d2585 FIX: If a topic/post cannot be oneboxed, don't swallow the href. 2013-08-24 15:08:36 -04:00
Robin Ward
20e8a8a38a FIX: Don't onebox @mentions 2013-08-24 15:01:00 -04:00
Neil Lalonde
1ef9354e21 Remove enum setting spec since I don't think it's testing anything useful and it's causing random failures 2013-08-24 13:48:07 -04:00
Giuseppe Capizzi
6f19cb7252 Extract ListController#list_target_user 2013-08-24 19:38:02 +02:00
Robin Ward
5e286443a8 FIX: Code blocks were trimming leading spaces sometimes when they should have only
trimmed trailing spaces.
2013-08-24 13:24:27 -04:00
Robin Ward
093ead7855 Support for ***bold and italics*** 2013-08-24 13:06:07 -04:00
versvs
50a49138a5 Added strings
Added some strings not yet existing in the "es" locale but already in use in the application.
2013-08-24 18:10:54 +02:00
Robin Ward
e9663e5338 Merge pull request #1332 from locks/user_email_observer
User email observer (Code Climate improvements)
2013-08-24 08:34:11 -07:00
Robin Ward
08762f5666 Merge pull request #1369 from voisintotoro/voisintotoro-branch
PNG Files optimization
2013-08-24 08:32:15 -07:00
Robin Ward
acf1124c0a Merge pull request #1370 from ofgeek/patch-2
Update client.zh_CN.yml
2013-08-24 08:31:19 -07:00
Robin Ward
45feafdacf Merge pull request #1374 from manzoid/install-doc
Clarify install doc wrt how to create databases
2013-08-24 08:28:22 -07:00
Tim Mansfield
07e7a44ddb Clarify install doc wrt how to create databases 2013-08-24 04:38:19 -07:00
Ricardo Mendes
37f4022f73 Refactors UserEmailObserver to improve Code Climate score
- Extracts certain logic to private methods and remove unnecessary
comments
- Extracts email enqueueing methods into a separate class
- Fix specs involving UserEmailObserver to call #after_commit instead
of the specific methods
2013-08-24 12:21:39 +01:00
Jeff Atwood
edbaafdd7b default relative dates to 30 days vs 14 2013-08-23 23:28:51 -07:00
Jeff Atwood
fb037290ac clarify on invite friends 2013-08-23 23:12:24 -07:00
Robin Ward
9ca0b0fe96 FIX: Emoticons were parsing twice sometimes. 2013-08-23 22:56:00 -04:00
Neil Lalonde
50bab18206 Version bump to v0.9.6.1 2013-08-23 17:51:10 -04:00
Neil Lalonde
6e79197519 Enum site settings can have translatable names in dropdown. Add setting for how often users get digest emails by default: default_digest_email_frequency. 2013-08-23 17:36:25 -04:00
Jeff Atwood
ee4ffe7abe Merge pull request #1372 from ZogStriP/site-setting-for-allowing-animated-avatars
add a site setting for allowing animated avatars
2013-08-23 14:26:33 -07:00
Régis Hanol
43a8bff652 add a site setting for allowing animated avatars 2013-08-23 18:55:02 +02:00
Neil Lalonde
663adde90e Users can change their own username at any time if they have no posts 2013-08-23 11:23:00 -04:00
Neil Lalonde
6a3c849067 Fix [object Object] in staff logs details modal 2013-08-23 10:08:35 -04:00
Jeff Atwood
f36fc8c41f remove unnecessary onebox body padding 2013-08-23 02:53:14 -07:00
Jeff Atwood
5cf0c59628 remove onebox info left padding 2013-08-23 02:48:55 -07:00
Einar Jonsson
84987cd835 Extracted nickname registration into a private controller method 2013-08-23 09:46:33 +00:00
Jeff Atwood
c409d91203 add "temporarily" to flagged content hidden 2013-08-23 00:07:08 -07:00
ofGEEK
1a58bfbdc9 Update client.zh_CN.yml 2013-08-23 09:52:10 +08:00
Sam
472f0684c3 Merge pull request #1345 from salbertson/refactor-find_by_username_or_email
Improve test coverage and refactor User.find_by_username_or_email
2013-08-22 17:14:06 -07:00
Neil Lalonde
3b15e2e58e Banned users are not returned as pending review users 2013-08-22 19:23:49 -04:00
Neil Lalonde
25e0c3eac1 Log IP addresses with screened emails and urls 2013-08-22 19:04:35 -04:00
Robin Ward
612c0ccccb FIX: Autolinking within a list 2013-08-22 18:03:01 -04:00
Robin Ward
513f941f50 Fixes @mentions inside of lists 2013-08-22 17:50:36 -04:00
Neil Lalonde
86012ac579 Fix a case when the wrong topic is loaded because the slug starts with a number 2013-08-22 16:23:46 -04:00
Robin Ward
f2c4b3e37f FIX: Following a mention with a coded mention. 2013-08-22 16:13:02 -04:00
Robin Ward
6fe0d29a01 FIX: @mentions within backticks followed by proper @mentions. 2013-08-22 15:55:29 -04:00
Jeff Atwood
32655e9dad digest email footer should say "unsubscribe" 2013-08-22 12:53:28 -07:00
Robin Ward
5e50c4624f FIX: New lines in code blocks were somewhat unpredictable 2013-08-22 13:46:51 -04:00