Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
22,577 Commits 207 Branches 500 Tags 853 MiB
Commit Graph

22577 Commits

Author SHA1 Message Date
Robin Ward c381086314 Merge pull request #4816 from jloh/fix_embeddable_host 
FIX: increase host_must_be_valid regex for .technology TLD
 2017-04-15 08:03:50 -07:00
jloh 5f47603b07
FIX: increase host_must_be_valid regex for .technology TLD 
.technology is 11 chars long and wasn't being matched previously
 2017-04-15 21:06:51 +10:00
Arpit Jalan 7389831961 Fix the build 2017-04-15 15:52:35 +05:30
Arpit Jalan 0954367bf4 FIX: send activation email when accepting invite if password is set 2017-04-15 14:59:50 +05:30
Régis Hanol c155b05595 Merge pull request #4815 from jomaxro/jomaxro-patch-1 
Use HTTPS for links to *.discourse.org
 2017-04-15 08:55:15 +02:00
jomaxro afe586329f Use HTTPS for links to *.discourse.org 2017-04-15 02:52:20 -04:00
Guo Xiang Tan 7719c023a3 Merge pull request #4806 from tgxworld/support_ruby_2_4 
Support Ruby 2.4.
 2017-04-15 12:52:09 +08:00
Guo Xiang Tan 04016f0dec Support Ruby 2.4. 2017-04-15 12:29:00 +08:00
Guo Xiang Tan 86efc57390 FIX: Onebox's dependencies were not updated. 2017-04-15 11:39:51 +08:00
Jeff Atwood dae3f9a69e Merge pull request #4813 from davidtaylorhq/theme_keys_fix 
FIX: Corrects typo to avoid error 500 on theme change
 2017-04-14 17:25:15 -07:00
David Taylor 96f2335c09 FIX: Corrects typo to avoid error 500 on theme change 2017-04-15 01:21:53 +01:00
Jeff Atwood d12ba0548c Merge pull request #4812 from cpradio/spec-auto-notification-update 
Add spec for auto notification update
 2017-04-14 16:01:38 -07:00
cpradio e3ad50de05 Add spec for auto notification update 
It should update the topic subscription so long as what is being requested is higher than what is currently set for the user and the given topic
It should not update the topic subscription if the requested subscription is less than what is currently set for the user and given topic
 2017-04-14 18:30:01 -04:00
Sam 0bb96e2536 FIX: stop double compiling all hbs files 2017-04-14 15:53:17 -04:00
Jeff Atwood ecace5085c Merge pull request #4811 from cpradio/update-auto-notification 
FIX: Update auto_notification to also update the subscription state when replying if the current state is less than the state being requested
 2017-04-14 12:50:49 -07:00
cpradio 4dc4c5bebc FIX: Update auto_notification to also update the subscription state when replying if the current state is less than the state being requested 2017-04-14 15:44:42 -04:00
Sam 4b6c49b13f correct specs 2017-04-14 15:25:34 -04:00
Sam 4ed4d77fd3 correct the monkey patch 2017-04-14 15:06:52 -04:00
Sam ed2e62f845 correct environment handling for test mode 2017-04-14 14:00:46 -04:00
Sam 873a07a625 trigger a stylesheed update 2017-04-14 13:36:49 -04:00
Sam def7348777 FIX: display custom sections with default theme 
also cleans up mechanism for previewing themes, cleans up naming,
gets rid of old janky "preview_style", secures local theme key
 2017-04-14 13:35:12 -04:00
Sam 8370b4b1b7 FIX: don't precompile if we have no themes table 2017-04-14 10:33:35 -04:00
Sam 4161a7abec FIX: allow CSS precompilation to access newly manifested assets 2017-04-14 10:30:19 -04:00
Arpit Jalan c9c7ec799f FIX: add minimum value for invites_per_page setting 2017-04-14 17:58:18 +05:30
Arpit Jalan fe29fe71c5 FIX: embedding comments was broken 2017-04-14 08:14:22 +05:30
Sam 2d636406dc FIX: in some case bundle exec fails from spawn 
there is some bundler magic in here, prefer bin stubs anyway
cause they are a bit faster
 2017-04-13 17:24:58 -04:00
Sam 809fbb25ce FIX: blanking theme field was not properly removing it 2017-04-13 17:24:15 -04:00
Sam 9927489f4e FEATURE: auto focus text editor when editing themes 2017-04-13 16:21:46 -04:00
Sam 43e4fc03ef FIX: clicking on themes while editing left a blank screen 2017-04-13 15:49:46 -04:00
Sam 3f4f0b32a9 FIX: path wizard showing with no style 2017-04-13 15:22:39 -04:00
Sam 37d4dd4a4b use scss mode instead of css mode 2017-04-13 12:05:27 -04:00
Sam ee950b419f correct transitioning to theme CSS editing 2017-04-13 11:09:31 -04:00
Sam 679b6548e6 FIX: order child themes by name 2017-04-13 10:51:44 -04:00
Sam e61be7af13 FIX: improve dark theme styling in header for tags 2017-04-13 10:39:36 -04:00
Sam 22214f5e5c Upgrade the Listen gem 2017-04-13 10:39:36 -04:00
Arpit Jalan ef093b1610 Merge pull request #4807 from techAPJ/email-token-social 
FIX: confirm email token for user created via social login
 2017-04-13 16:18:15 +05:30
Guo Xiang Tan 3d76fb9c2c FIX: Don't show category options for reports that can't be scoped to a category. 2017-04-13 17:10:55 +08:00
Arpit Jalan 7fb17b83c4 FIX: confirm email token for user created via social login 2017-04-13 14:15:32 +05:30
Guo Xiang Tan bda20cc44a FIX: Don't enqueue topic status update job if topic is deleted. 2017-04-13 12:02:35 +08:00
Guo Xiang Tan ee449b0dd5 Improve SSO verbose log when user record is invalid. 2017-04-13 11:39:26 +08:00
Guo Xiang Tan 72c16967e6 FIX: Check for reserved usernames before hitting DB. 2017-04-13 11:32:20 +08:00
Guo Xiang Tan 57788200ec REFACTOR: Add `User.reserved_username?`. 2017-04-13 10:44:26 +08:00
Guo Xiang Tan f48022b674 Upgrade Rails to 4.2.8. 2017-04-13 10:17:09 +08:00
Guo Xiang Tan 6db0cba005 Merge pull request #4803 from ckeboss/patch-1 
Wrap directory names in quotes
 2017-04-13 09:47:49 +08:00
Régis Hanol a5f1c57a70 bump onebox 2017-04-13 00:49:22 +02:00
Guo Xiang Tan 0165b22b76 Bump onebox. 2017-04-13 06:31:25 +08:00
Neil Lalonde 07d596ea05 FIX: handle expanding quotes from deleted posts by rendering a trash icon 2017-04-12 16:48:47 -04:00
Régis Hanol ff6a98183f WIP: JIVE importer using the API 2017-04-12 22:30:36 +02:00
Neil Lalonde 2916b45666 multiplier should not have been changed 2017-04-12 14:48:30 -04:00
Neil Lalonde d34dd4ed4f FIX: pasting link into composer with a topic template will onebox the link after the template 2017-04-12 14:48:30 -04:00