Commit Graph

13231 Commits

Author SHA1 Message Date
Régis Hanol
42ab39ce18 fix the build (cc @riking) 2015-02-05 12:57:33 +01:00
Régis Hanol
f1403206ca Merge pull request #3169 from riking/patch-3
SECURITY: Don't leak topic title in the redirect
2015-02-05 12:47:58 +01:00
Régis Hanol
48de485f72 Merge pull request #3170 from riking/show_mentions
FEATURE: Mentions stream on user profile
2015-02-05 12:47:22 +01:00
Régis Hanol
ea50d22302 ⬆️ update font-awesome 2015-02-05 12:47:02 +01:00
Régis Hanol
8061f7fa72 Merge pull request #3171 from techAPJ/patch-1
FIX: subcategory url was incorrect in rss
2015-02-05 10:05:13 +01:00
Arpit Jalan
026df5185e FIX: subcategory url was incorrect in rss 2015-02-05 13:22:28 +05:30
riking
2154f5478a FEATURE: Mentions stream on user profile 2015-02-04 22:03:44 -08:00
Sam
970b160eef typo 2015-02-05 16:39:56 +11:00
Sam
08b790b3c2 improve metrics gathered using in our traffic section
this also pulls out the middleware into its own home and inserts in front
2015-02-05 16:08:52 +11:00
Sam
ebc2ad7c81 remove the word application 2015-02-05 12:52:55 +11:00
Sam
8690c7c49f defer counting to avoid race condition 2015-02-05 12:19:21 +11:00
Sam
bfa96811c1 remove leftover code 2015-02-05 11:54:25 +11:00
Sam
16465edd88 FEATURE: search your bookmarks using in:bookmarks 2015-02-05 11:50:20 +11:00
Sam
eb7a5c251d freeze time in report spec so it has consistent results 2015-02-05 11:33:13 +11:00
Sam
c9adfa65a0 FEATURE: dashboard stats for application traffic 2015-02-05 11:18:21 +11:00
Robin Ward
3b68214210 FIX: Clean up after adding events. Fixes random test failures. 2015-02-04 17:33:18 -05:00
Robin Ward
25daca8f23 Helpers for plugins to support enabling/disabling 2015-02-04 16:23:56 -05:00
Robin Ward
530b20d339 Memoize readers for plugins to avoid nil checks 2015-02-04 16:23:55 -05:00
Robin Ward
f9695882b1 Add plugins category to settings so plugins can use them 2015-02-04 16:23:55 -05:00
Neil Lalonde
27557b8402 ApplicationRequest can return a report 2015-02-04 15:05:22 -05:00
riking
4c8850108a SECURITY: Don't leak topic title in the redirect 2015-02-04 11:55:39 -08:00
Jeff Atwood
3948a960cd minor tweak for new topic alignment 2015-02-04 11:29:56 -08:00
Régis Hanol
8a5a229c3f FIX: category backgrounds were broken 2015-02-04 16:38:42 +01:00
Régis Hanol
49b02287dc FEATURE: remove any .tar leftovers when backing up 2015-02-04 11:49:11 +01:00
Sam
aca05267cd oops 2015-02-04 21:37:02 +11:00
Sam
b3b4d390fa add missing localization 2015-02-04 21:17:40 +11:00
Sam
70daf6ef2d workaround slow command line 2015-02-04 18:38:18 +11:00
Sam
3fc930526c fix typo 2015-02-04 18:25:37 +11:00
Sam
67eccee990 FEATURE: basic disk space usage stats 2015-02-04 18:05:17 +11:00
Sam
a4b96adfc5 eliminate cross talk in site setting test 2015-02-04 16:57:16 +11:00
Sam
21402d9d9e annotations 2015-02-04 16:34:25 +11:00
Sam
c150c55e2d FEATURE: rudimentary view tracking wired in 2015-02-04 16:15:16 +11:00
Sam
e105f0965c infrustructure for tracking application web requests 2015-02-04 16:15:16 +11:00
Sam
06edfb85a9 annotations 2015-02-04 16:15:16 +11:00
Jeff Atwood
dc96d6bafe move admin topic wrench down a bit 2015-02-03 15:01:23 -08:00
Neil Lalonde
8689c85b54 add error handling when granting admin and moderator privileges 2015-02-03 17:42:08 -05:00
Robin Ward
aacf2e6f20 Can add shadowed_by_global to a site setting to override
If a site setting has `shadowed_by_global: true` then, if
a `GlobalSetting` exists with the same name then that value
will be used instead.  Additionally, the setting will be hidden.

This is useful in a multisite environment for private settings
such as API keys. You want to set it globally, yet not display
the key to customers.
2015-02-03 16:49:22 -05:00
Robin Ward
4c6c021b5c Merge pull request #3168 from techAPJ/patch-2
add class for container div on 404 page
2015-02-03 15:12:58 -05:00
Robin Ward
14a8b3e29c FIX: In case a topic is deleted, allow us to serialize their posts 2015-02-03 14:51:50 -05:00
Neil Lalonde
8a1197626d Version bump to v1.2.0.beta6 2015-02-03 14:18:10 -05:00
Arpit Jalan
68377ba4ab add class for container div on 404 page 2015-02-04 00:40:21 +05:30
Neil Lalonde
b64deaae67 Merge pull request #3167 from techAPJ/update-translations
Update Translations
2015-02-03 14:03:40 -05:00
Arpit Jalan
ba0cb45f4b Update Translations 2015-02-04 00:20:05 +05:30
Robin Ward
9a07945a16 FIX: Don't add constants for ES6 modules in plugins
If you're using ES6 in a plugin, you shouldn't be depending on the
backwards compatibility layer. That's for proper Discourse only.
2015-02-03 13:14:05 -05:00
Erick Guan
58024a8f4d add table prefix constant to bbpress import script & fix user imports 2015-02-03 10:06:35 -08:00
Robin Ward
d0630b7f26 Update to latest onebox gem 2015-02-03 12:55:41 -05:00
Régis Hanol
0e5c9b2590 small upload code refactor 2015-02-03 18:44:18 +01:00
Régis Hanol
91b3123e14 Merge pull request #3165 from techAPJ/patch-2
FIX: allow TL4 user to rebake post
2015-02-03 18:32:43 +01:00
Arpit Jalan
b413c6249d FIX: allow TL4 user to rebake post 2015-02-03 22:49:01 +05:30
Robin Ward
d9c6acafc0 Merge pull request #3164 from techAPJ/patch-2
FIX: URL encoding was not working for %23 in links
2015-02-03 11:39:40 -05:00