Commit graph

11213 commits

Author SHA1 Message Date
Régis Hanol
aa3a658bb1 remove float from the 'show email' button on user's profile on mobile 2014-10-06 22:24:43 +02:00
Robin Ward
e886cc2dad Revert "new docked title category style - needs additional work"
This reverts commit 43467a8aaa.
2014-10-06 16:13:51 -04:00
Robin Ward
85b6b2550e Revert "Add striped category badges under title"
This reverts commit 331e63e3af.
2014-10-06 16:13:51 -04:00
Robin Ward
379b810397 Merge pull request #2853 from techAPJ/patch-3
FIX: fix broken test
2014-10-06 15:59:16 -04:00
Robin Ward
331e63e3af Add striped category badges under title 2014-10-06 15:58:57 -04:00
Kris Aubuchon
43467a8aaa new docked title category style - needs additional work 2014-10-06 15:58:57 -04:00
Régis Hanol
ac069d22a9 FIX: delete spammer modal doesn't show the email address 2014-10-06 21:55:52 +02:00
Arpit Jalan
20c2480eb3 FIX: fix broken test 2014-10-07 01:23:39 +05:30
Régis Hanol
baee5c95ac add more context to allow better translation of 'max' in TL3 requirements 2014-10-06 21:32:19 +02:00
Jeff Atwood
e301a89b3f optional_re shouldn't be included by default 2014-10-06 12:31:17 -07:00
Neil Lalonde
427487783b remove block_login? check from current user 2014-10-06 14:39:48 -04:00
Régis Hanol
67c10a7eab UX: add topic admin button to the bottom of the topic 2014-10-06 20:19:07 +02:00
Robin Ward
b1271ed44b FIX: Remove html entities from text emails 2014-10-06 13:57:38 -04:00
Robin Ward
55fc54fe69 Merge pull request #2844 from akshaymohite/optimization-fixes
raise migration error in development if pending migrations
2014-10-06 13:35:53 -04:00
Robin Ward
d82767fbdf Merge pull request #2845 from akshaymohite/access-specifiers-fix
Fix access specifiers with private_class_methods instead of removing dir...
2014-10-06 13:34:29 -04:00
Robin Ward
318286dc7c Merge pull request #2847 from techAPJ/patch-2
Improve email_subject setting copy
2014-10-06 13:33:15 -04:00
Jeff Atwood
948f4a59e9 Merge pull request #2852 from awesomerobot/master
restructuring post titles a bit
2014-10-06 09:57:00 -07:00
Robin Ward
90e3242a3c FIX: topic-admin-menu controller was not a proper singleton. 2014-10-06 12:27:12 -04:00
Kris Aubuchon
1224ffa1c5 restructuring post titles a bit 2014-10-06 11:50:18 -04:00
Robin Ward
47573fcd99 FIX: error importing some topics where bumped_at coudln't be
determined.
2014-10-06 09:26:52 -04:00
Sam
6391dc7f28 FIX: hitting edit while replying does nothing 2014-10-06 10:51:02 +11:00
Sam
54281d5944 badge system is not experimental 2014-10-06 09:36:56 +11:00
Arpit Jalan
f3b05993e0 Improve email_subject setting copy 2014-10-05 23:15:37 +05:30
Akshay
378bc6e5dc private methods need to be called as method_name instead of ClassName#method_name 2014-10-04 09:53:46 +05:30
Akshay
9524b514c6 Fix access specifiers with private_class_methods instead of removing directly 2014-10-04 09:20:41 +05:30
Akshay
7cd8b4f329 raise migration error in development if pending migrations 2014-10-04 07:02:30 +05:30
Jeff Atwood
fa830c8d69 fix avatar expanded topic map height 2014-10-03 15:58:02 -07:00
Jeff Atwood
3483c7b0de UX: drop text from loading spinner, make bigger 2014-10-03 13:38:55 -07:00
Neil Lalonde
90771937f0 FIX: broken external auth 2014-10-03 16:15:00 -04:00
Jeff Atwood
ce8a4266b6 FIX: mobile layout was too wide 2014-10-03 12:49:48 -07:00
Robin Ward
1e5195e68f FIX: Could sometimes open two category drop downs at once. 2014-10-03 15:42:45 -04:00
Robin Ward
45ad31c1c8 Merge pull request #2843 from zconnelly13/change_supported_version_of_ruby
Change supported version of ruby
2014-10-03 14:51:47 -04:00
Robin Ward
e55b437eb9 Replace the rest of the deprecated {{action xyz}} with `{{action
"xyz"}}`
2014-10-03 14:43:27 -04:00
Zac Connelly
7f8a42a63a Change supported version of ruby 2014-10-03 17:48:36 +00:00
Robin Ward
f2520939b8 Merge pull request #2839 from Elberet/smf2-import
Fix pretty_text translation helper again, this time for real
2014-10-03 13:13:32 -04:00
Robin Ward
41db949e9d FIX: Allow HTML in custom fields 2014-10-03 13:06:54 -04:00
Robin Ward
aeba5ca7d9 Merge pull request #2842 from techAPJ/patch-2
FEATURE: show topic category in email subject
2014-10-03 12:52:34 -04:00
Arpit Jalan
0ae0552543 FEATURE: show topic category in email subject 2014-10-03 22:08:59 +05:30
Jeff Atwood
4343b19c1b Revert "Fix: CSS to reveal hidden or partially visible avatars on 2nd line"
This reverts commit a6d6f6b42a.
2014-10-03 09:25:36 -07:00
Régis Hanol
d4f9228058 Merge pull request #2841 from lidel/fix-min-username
FIX: fix @mentions for 1 character usernames
2014-10-03 17:37:47 +02:00
Neil Lalonde
83fc88e965 FIX: when site is in read-only mode, create account action should show a warning like login does. 2014-10-03 11:02:05 -04:00
Neil Lalonde
eb473696ff Refactor showLogin and showCreateAccount actions for extensibility 2014-10-03 11:02:05 -04:00
Neil Lalonde
ebf46450bc Refactor omniauth_callbacks_controller for extensibility 2014-10-03 11:02:04 -04:00
Neil Lalonde
2f581e6900 Version bump to v1.1.0.beta4 2014-10-03 10:48:15 -04:00
Neil Lalonde
4f461739fb Update translations 2014-10-03 10:41:37 -04:00
Marcin Rataj
a56f5a9b65 FIX: fix @mentions for usernames shorter than 2 characters
Super short usernames were enabled by
https://github.com/discourse/discourse/pull/2838
This is just a fix for @mentions
2014-10-03 13:20:40 +02:00
Sam
f2957b126e add more diagnostics to encoding issues 2014-10-03 19:45:42 +10:00
Sam
f5912a5500 amend previous fix 2014-10-03 16:35:35 +10:00
Sam
8c214c35e4 FIX: clicking on heading could insert a broken heading 2014-10-03 16:35:02 +10:00
Sam
b525d95d19 Merge pull request #2840 from lidlanca/patch-6
Fix: CSS to reveal hidden or partially visible avatars on 2nd line topic map
2014-10-03 15:55:11 +10:00