github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-25 01:32:23 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
6,959 Commits 190 Branches 500 Tags 938 MiB
084f51b013
Commit Graph

6959 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Régis Hanol
084f51b013 FEATURE: do not show category definition topic on top pages 2014-03-07 12:02:52 +01:00
Régis Hanol
f52ab7fc77 Merge pull request #2067 from riking/better-backup-name 
Add site name to beginning of backup filename
 2014-03-07 11:47:58 +01:00
Régis Hanol
2c2d3ac071 Merge pull request #2068 from riking/site_settings_refresh 
Refresh the site after updating certain site settings
 2014-03-07 11:46:15 +01:00
Régis Hanol
dbb383497c Merge pull request #2072 from ligthyear/fix-edit-body-too-similar-issue 
Be more liberal when users wants to change their own body to a previous version
 2014-03-07 11:38:59 +01:00
Régis Hanol
f618278b42 make sure topic specs aren't DST sensitive 2014-03-07 11:38:24 +01:00
Régis Hanol
f25bcc5067 couple of bugfixes identified while importing from VB 2014-03-07 10:44:04 +01:00
Régis Hanol
7670598658 Merge pull request #2070 from nschonni/fix-mailformed-rule 
Fix unmatched braces of "nav.post-controls button"
 2014-03-07 10:37:25 +01:00
Sam
e9fe8f6063 Revert "BUGFIX: if uploads is in a symlinked directory stuff breaks" 
This reverts commit 894bb0716c.

The issue here was that docker was not mounting stuff properly post
reboot, then we had a broken symlink that "exists"
 2014-03-07 19:22:40 +11:00
Sam
894bb0716c BUGFIX: if uploads is in a symlinked directory stuff breaks 2014-03-07 19:17:11 +11:00
Jeff Atwood
b91eb8ed38 fix user page primary width 2014-03-07 00:01:42 -08:00
Sam
73ef91cf27 junk code removed 2014-03-07 19:00:36 +11:00
Sam
b19400726f BUGFIX/FEATURE: store topic changes in post revisions 
History + edit notifications for title and category changes
 2014-03-07 19:00:36 +11:00
Benjamin Kampmann
d956ca9cf7 Be more liberal when the similar content of the post to be saved turns out to be the same post 
- instead of setting a random number, we actually store the post id in redis now
 - and when checking for matching recent post and it is the same, we allow it still

Fixes the issue that we prevent a user from reverting to a previous state within the unique_posts_min time window.
 2014-03-07 08:23:15 +01:00
Jeff Atwood
83272d6986 update screenshot 2014-03-06 23:23:00 -08:00
Nick Schonning
c43e86d7c6 Fix unmatched braces of "nav.post-controls button" 
Spacing changes made so that the other braces could be compared
 2014-03-07 00:29:58 -05:00
Jeff Atwood
0d84ec4d58 Merge pull request #2069 from nschonni/remove-tabs 
Remove IE7< star hacks
 2014-03-06 21:04:32 -08:00
riking
d0dbc26281 Change BACKUP_ROUTE_FORMAT to support pretty-name backups 2014-03-06 20:59:10 -08:00
Nick Schonning
3b881f3215 Remove IE7< star hacks 2014-03-06 23:55:57 -05:00
riking
bb634bd4f5 Add request_refresh to script/discourse 2014-03-06 20:26:34 -08:00
riking
ccd3e635d2 Refresh the site after updating certain site settings 2014-03-06 20:24:23 -08:00
riking
01826b9c18 Add site name to beginning of backup filename 2014-03-06 16:34:31 -08:00
Robin Ward
b3a860027f Update onebox gem to fix stackexchange URL issue 2014-03-06 17:12:07 -05:00
Robin Ward
49a1733d97 FIX: We should use partials when rendering but keeping the same context. 2014-03-06 15:56:33 -05:00
Robin Ward
102242c9d5 Add Dismiss Read to mobile view 2014-03-06 15:32:49 -05:00
Robin Ward
e2ea148e38 FEATURE: Allow customHTML helper to resolve to a template if it 
exists.
 2014-03-06 13:32:32 -05:00
Régis Hanol
11d91328ab Merge pull request #2056 from vikhyat/pm-likes 
Don't suppress like notifications in private messages
 2014-03-06 14:53:27 +01:00
Vikhyat Korrapati
944246f4af Add test to ensure creation of like notification in a PM. 2014-03-06 19:07:26 +05:30
Régis Hanol
ac99947979 BUGFIX: topic specs were dependent on Time.now 
which would fail when DST was around
 2014-03-06 12:44:52 +01:00
Régis Hanol
aeafca6649 Merge pull request #2061 from nschonni/use-loops-for-bbcode 
Use for loop to shrink bbcode
 2014-03-06 11:12:42 +01:00
Régis Hanol
909edadc1f Merge pull request #2063 from CirnoKaster/patch-1 
fix translate mistake
 2014-03-06 11:11:54 +01:00
CirnoKaster
334ae44fb7 fix translate mistake 
Line 626
minor change : favourite > starred
 2014-03-06 15:02:55 +08:00
Nick Schonning
bbe2d3cfe9 Strip tabs from sheets 2014-03-06 01:51:39 -05:00
Nick Schonning
978c120279 Use for loop to shrink bbcode 
Dry out the long set of similar selectors
 2014-03-06 01:45:31 -05:00
Jeff Atwood
cf90f0815f Merge pull request #2060 from nschonni/remove-units-for-zero-values 
Remove units for zero values
 2014-03-05 22:21:58 -08:00
Nick Schonning
4f1a517490 Remove units for zero values 
Units are ignored for zero values in CSS except for a few edge cases.
 2014-03-06 01:14:51 -05:00
Jeff Atwood
15c46af838 Merge pull request #2059 from nschonni/remove-empty-rules 
Remove empty SCSS rules
 2014-03-05 22:07:40 -08:00
Nick Schonning
f43072135d Remove empty SCSS rules 2014-03-06 01:02:00 -05:00
Jeff Atwood
bf6d645c38 Merge pull request #2058 from awesomerobot/master 
modifying user profile to better support image backgrounds
 2014-03-05 20:59:00 -08:00
Kris Aubuchon
699692168d modifying user profile to better support image backgrounds 2014-03-05 23:22:24 -05:00
Jeff Atwood
c747e10c7f Merge pull request #2057 from awesomerobot/master 
adding basic :focus style in for buttons in Firefox
 2014-03-05 19:32:10 -08:00
Kris Aubuchon
899a5a87cd adding basic :focus style in for buttons in Firefox 2014-03-05 22:18:42 -05:00
Robin Ward
2b0151afe9 BUGFIX: Editing a category would break categories for the current user 
session.
 2014-03-05 17:33:14 -05:00
Régis Hanol
ca12ea42a7 FEATURE: only redirect new users to top page for a limited period 
That period is defined by the `redirect_new_users_to_top_page_duration`
site setting and defaults to 7 days.
 2014-03-05 22:11:01 +01:00
Robin Ward
b0f3061113 It doesn't make sense to redirect when not logged in on a non-GET 
request. We should report a failure then. They likely logged out or
in another tab or timed out.
 2014-03-05 12:12:53 -05:00
Régis Hanol
2a99f1b15e BUGFIX: HOME/END keyboard shortcuts on non-topic pages 
This make sure both HOME/END keyboard shortcuts are only applied when viewing a topic
 2014-03-05 16:08:45 +01:00
Régis Hanol
bce4130d39 Merge pull request #2036 from ArmedGuy/profile-backgrounds 
FEATURE: Profile Backgrounds
 2014-03-05 16:00:49 +01:00
Johan Jatko
98c479c3c4 FEATURE: Profile Backgrounds 
Shares a modified codebase with avatars called "user_image"
 2014-03-05 15:10:44 +01:00
Régis Hanol
aadf807054 Merge pull request #2055 from ligthyear/allow-html-in-poll-options 
Allow poll options to contain rendered code
 2014-03-05 10:48:03 +01:00
Régis Hanol
386b1589f2 Bump the JS test suite timeout to 2 minutes 
So that it can run properly on my 3-year old MBA
 2014-03-05 10:45:57 +01:00
Benjamin Kampmann
a2512ecf74 Allow poll options to contain rendered code by not escaping it. 2014-03-05 10:45:49 +01:00