Commit graph

18386 commits

Author SHA1 Message Date
Robin Ward
46e4768971 FIX: highlight.js is used, but for highlighting text, not code. 2016-02-18 12:19:00 -05:00
Robin Ward
849c99f83d Remove Discourse.Mobile constants 2016-02-18 12:19:00 -05:00
Robin Ward
ef75f87c8b Remove unused file 2016-02-18 12:19:00 -05:00
Régis Hanol
3b9223c5da bump email_reply_trimmer to latest version 2016-02-18 16:56:45 +01:00
Sam
b9bcdb984a Merge branch 'master' into vdom 2016-02-18 16:57:40 +11:00
Sam
f0e942f647 PERF: move 3 more option columns out of the user table 2016-02-18 16:57:22 +11:00
Sam
b11e6ec38e Merge branch 'master' into vdom 2016-02-18 13:20:55 +11:00
Sam
f9c5cded6f Correct live refresh routine for notifications 2016-02-18 13:20:22 +11:00
Robin Ward
c0a6e34610 API for extra post menu buttons and support for solved button 2016-02-17 15:56:30 -05:00
Robin Ward
98f4b3f8a9 FIX: Bad merge 2016-02-17 12:00:08 -05:00
Régis Hanol
52a6682690 FIX: don't create an EmailLog when we can't send a digest 2016-02-17 17:31:46 +01:00
Régis Hanol
532fb7ea9d fix smoke tests 2016-02-17 11:57:06 +01:00
Régis Hanol
8893d711e0 FEATURE: new pop3 polling configuration admin dashboard check 2016-02-17 11:25:49 +01:00
Régis Hanol
2f926cfdd3 only drop users table columns if they exists 2016-02-17 11:02:44 +01:00
Sam
1e131a120c Merge branch 'master' into vdom 2016-02-17 18:39:11 +11:00
Sam
8981ca41f0 correct acceptance test 2016-02-17 18:38:57 +11:00
Sam
a766f71881 Merge branch 'master' into vdom 2016-02-17 18:14:12 +11:00
Sam
a5c5ac12fb correct spec 2016-02-17 18:13:57 +11:00
Sam
e8f76c335a Merge branch 'master' into vdom 2016-02-17 18:10:12 +11:00
Sam
6912aa9fd9 Remove superflous columns from the users table 2016-02-17 18:08:25 +11:00
Sam
bbbb09a6fb FEATURE: start tracking information about migrations that run
This commit adds a new tracking table that lets us know

- When a migration ran
- What version Discourse was at
- How long it took
- What version Rails was at

The built in tracking in Rails is very limited, does not track this info
2016-02-17 18:08:25 +11:00
Sam
3829c78526 PERF: shift most user options out of the user table
As it stands we load up user records quite frequently on the topic pages,
this in turn pulls all the columns for the users being selected, just to
discard them after they are loaded

New structure keeps all options in a discrete table, this is better organised
and allows us to easily add more column without worrying about bloating the
user table
2016-02-17 18:08:25 +11:00
Robin Ward
63cda22623 Upgrade withPluginApi to support non-api callbacks 2016-02-16 16:44:27 -05:00
Robin Ward
c6456f5c3e Provide an option callback to the API 2016-02-16 16:22:35 -05:00
Robin Ward
1145d204ed FIX: Editing a post wasn't refreshing properly 2016-02-16 15:22:05 -05:00
Robin Ward
5bc1c5130e FIX: Notifying users via flag wasn't refreshing the UX 2016-02-16 14:35:12 -05:00
Robin Ward
ba203b3a94 FIX: Deleting selected wasn't marking them as deleted 2016-02-16 14:27:41 -05:00
Robin Ward
5d9278c098 FIX: Can force all shadow trees to rerender 2016-02-16 14:20:16 -05:00
Robin Ward
9eed95dc7b FIX: Flag button was visible to anon 2016-02-16 12:51:20 -05:00
Robin Ward
cbd90339ca Add some padding to whisper icons 2016-02-16 12:47:54 -05:00
Robin Ward
9d86ffe412 UX: Rerender the like before the promise resolves. 2016-02-16 12:39:09 -05:00
Régis Hanol
63b9d1c645 FIX: sends an email notifcation when a user's post is linked 2016-02-16 18:29:23 +01:00
Robin Ward
3811b8aa4c withPluginAPI shim to updated plugins will not raise errors 2016-02-16 12:25:01 -05:00
Robin Ward
3a78321c63 withPluginApi means you don't have to check for null. 2016-02-16 12:17:22 -05:00
Robin Ward
3ea1f88cdc Merge branch 'master' into vdom 2016-02-16 11:48:42 -05:00
Régis Hanol
bf96025507 link email logs to the post that generate the email notification when available 2016-02-16 16:35:57 +01:00
Régis Hanol
81c6fb318b FIX: show name in preferences when SSO is enabled and is used to override names 2016-02-16 16:09:05 +01:00
Régis Hanol
71905dfdc4 Merge pull request #4015 from fantasticfears/fix-conflicting-topic-summary-counter
FIX: topic summary description text was conflicts with reply counter
2016-02-16 13:11:01 +01:00
Erick Guan
0c6e5befe4 FIX: topic summary description text was conflicts with reply counter 2016-02-16 12:38:51 +01:00
Régis Hanol
3538e48640 Merge pull request #4014 from dandv/patch-5
Capitalize "ip" in "ip address"
2016-02-16 10:54:06 +01:00
Régis Hanol
c33a6ddfed Merge pull request #4009 from ebernhardson/export_category_filename
Take filename to write to as optional parameter to export_category
2016-02-16 10:53:22 +01:00
Sam
18d67851c0 Merge branch 'master' into vdom 2016-02-16 11:53:14 +11:00
Sam
2b689d45ff Revert "save height on small screens"
This reverts commit 37b5905b44.

It is causing too much confusion for little gain
2016-02-16 11:52:33 +11:00
Dan Dascalescu
c75360f809 Capitalize "ip" in "ip address" 2016-02-15 15:59:31 -08:00
Régis Hanol
4ad5660615 add slightly more logs when skipping email notifications 2016-02-15 17:53:07 +01:00
Guo Xiang Tan
2af587005b FIX: find_by_attribute method in Rails 4.5 is case insensitive.
* https://github.com/rails/rails/pull/23690
2016-02-15 23:05:16 +08:00
Régis Hanol
40b099f1a6 FIX: keep whitespaces when replacing direct link to external images with local images 2016-02-15 12:34:45 +01:00
Robin Ward
482a65821b FIX: Latest eslint doesn't recognize TypedArray 2016-02-15 11:12:57 +01:00
Sam
bdcd791530 Merge branch 'master' into vdom 2016-02-15 20:47:23 +11:00
Sam
d7400dd10a UX: Stop taking you to user page when compose private message is called 2016-02-15 20:27:29 +11:00