Commit Graph

22700 Commits

Author SHA1 Message Date
Arpit Jalan 1c23aedccf FIX: always send password reset email when accepting invite if password is not set 2017-04-18 14:37:06 +05:30
Guo Xiang Tan 60f1169077 REFACTOR: Reduce repetition in code. 2017-04-18 17:03:49 +08:00
Guo Xiang Tan 03762e2828 Merge pull request #4818 from OsamaSayegh/ui/groups-heading-admin-page
The "Groups" section's heading on user admin page was visible to mods
2017-04-18 16:12:33 +08:00
Arpit Jalan ca567caee4 Merge pull request #4821 from discourse/revert-4819-website-validation
Revert "FIX: User website allows new TLDs"
2017-04-18 13:37:26 +05:30
Arpit Jalan 8dea70d354 Revert "FIX: User website allows new TLDs" 2017-04-18 13:18:51 +05:30
Arpit Jalan fa1b6da988 Merge pull request #4819 from discourse/website-validation
FIX: User website allows new TLDs
2017-04-18 10:19:21 +05:30
Jeff Atwood 8440ea3a56 Merge pull request #4820 from jomaxro/patch-2
Small copy edit for tracking notification reasons
2017-04-17 21:39:00 -07:00
jomaxro 5e63563260 Small copy edit for tracking notification reasons 2017-04-18 00:17:52 -04:00
Rafael dos Santos Silva 4289dbe3e5 FIX: User website allows new TLDs 2017-04-18 00:30:37 -03:00
Robin Ward 1363988cd7 Support for an HTML builder that can create dynamic HTML 2017-04-17 17:32:55 -04:00
Sam 3ccd5eacb4 prefer multiline \A \z 2017-04-17 16:57:37 -04:00
Sam 86904e9cd6 FIX: better error handling for theme import 2017-04-17 16:55:53 -04:00
Sam 5e3a0846f7 FEATURE: allow themes to share color schemes 2017-04-17 15:56:24 -04:00
Sam 1872a1714f Merge pull request #4817 from jomaxro/patch-1
Disable browser auto-complete for messages
2017-04-17 14:57:23 -04:00
osamasayegh 3e048d686e The "Groups" section's heading on user admin page was visible to mods
Since moderators can't manage a user groups, they shouldn't see the Groups heading on the user admin page.

## Before:

![before](https://cloud.githubusercontent.com/assets/17474474/25099135/c0e1d5a4-23b3-11e7-95d1-8036bff057d4.png)


## After:

![after](https://cloud.githubusercontent.com/assets/17474474/25099130/c060a538-23b3-11e7-8428-602fc523e9e8.png)
2017-04-17 21:53:30 +03:00
jomaxro 7b708e5cf2 Disable browser auto-complete for messages 2017-04-17 14:24:09 -04:00
Arpit Jalan ae96631692 Update Translations 2017-04-17 23:46:18 +05:30
Sam 3906f55132 add binstub for rspec 2017-04-17 12:58:34 -04:00
Sam b43d2e42f4 missing spots 2017-04-17 12:30:20 -04:00
Sam 81ebe853d1 missed a few spots 2017-04-17 12:05:23 -04:00
Sam 5dd752877e FEATURE: try adding some preload hints for chrome 2017-04-17 11:52:43 -04:00
Sam cfef100ed7 FIX: ignore loose .es6 files during precompile
also corrects precompile statement to include preload store
2017-04-17 11:04:00 -04:00
Sam 6e5296a510 FEATURE: upgrade sprockets to latest stable
This unlocks Rails upgrades, so we can now upgrade to latest Rails
2017-04-17 10:12:05 -04:00
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