Commit graph

13260 commits

Author SHA1 Message Date
Régis Hanol
206d3233c9 FEATURE: when PMing a user from the topic page, insert a link to the current post 2015-02-18 12:17:54 +01:00
Régis Hanol
3614038a5d Merge pull request #3210 from Flink/bugfix-regression-topics-controller
Fix regression on editing private messages
2015-02-18 10:29:22 +01:00
Sam
fff55e0ee3 FEATURE: allow users to specify if prepared statements are allowed
(they need to be disabled for pgpool based setups)
2015-02-18 11:16:53 +11:00
Loïc Guitaut
395654bf24 Fix regression on editing private messages
v1.2.0beta9 has introduced a regression in edit of a private topic
(first post). Previously a check for no change in TopicsController was
made but it has been changed without considering that the topic could
be private.

By simply forcing a conversion of `topic.category_id` to integer, the case
where its value is nil is handled correctly as it was previously.
2015-02-18 00:41:16 +01:00
Jeff Atwood
fe31d45131 edited the wrong language file
DOH
2015-02-17 15:22:56 -08:00
Jeff Atwood
cd978def70 slight copyedit on seq reply edu panel 2015-02-17 15:08:52 -08:00
Régis Hanol
59da28bda4 FIX: editing a PM should never change the category_id 2015-02-17 23:10:34 +01:00
Robin Ward
762e60c0a6 FIX: Back button was wonky at times 2015-02-17 16:21:30 -05:00
Robin Ward
2104c08fb7 FIX: About user count was off by 1 2015-02-17 15:32:06 -05:00
Robin Ward
a15a35f482 Merge pull request #3209 from techAPJ/patch-1
FIX: do not show name in email if name on posts are disabled
2015-02-17 15:23:04 -05:00
Arpit Jalan
6e5540c107 FIX: do not show name in email if name on posts are disabled 2015-02-18 01:39:41 +05:30
Régis Hanol
38cc1bf6c1 FIX: columns of uncategorized pinned topics shift when the topic gets unpinned 2015-02-17 18:20:19 +01:00
Régis Hanol
8fe47539c8 add missing translation 2015-02-17 17:22:51 +01:00
Jeff Atwood
eddbfc555f add info on how to add more staff members 2015-02-17 00:38:56 -08:00
Jeff Atwood
3ace001971 Merge pull request #3208 from techAPJ/patch-1
UX: add user invite link on admin interface
2015-02-17 00:28:57 -08:00
Arpit Jalan
daea3bb687 UX: add user invite link on admin interface 2015-02-17 13:47:59 +05:30
Jeff Atwood
73a59322d5 "Page Views" is confusing; say "API Requests" 2015-02-16 23:35:41 -08:00
Sam
632ae639e1 Merge pull request #3191 from riking/patch-turkish
FIX: 🈂️ Pluralization rules were wrong lang keys
2015-02-17 12:21:08 +11:00
Sam
a7d08172c8 Merge pull request #3206 from edgibbs/sort_admin_user_badges_by_name
FIX: Default sort grantable badges by name
2015-02-17 12:18:15 +11:00
Sam
d56b71851b FEATURE: configurable connection reaping settings 2015-02-17 09:58:43 +11:00
Sam
cdef67667a PERF: allow background jobs to flush between requests in same thread 2015-02-17 09:58:43 +11:00
Sam
6c09b6739d BUG: minor, do not send access origin if not set 2015-02-17 09:58:43 +11:00
Neil Lalonde
8d56aa12e9 Version bump to v1.2.0.beta9 2015-02-16 16:09:11 -05:00
Régis Hanol
3cad4824d7 FEATURE: allow moderators to see flagged private messages 2015-02-16 13:03:04 +01:00
Régis Hanol
0b45054e2b FIX: couldn't uncategorize a topic 2015-02-16 10:31:36 +01:00
Sam
f7fa13049c Merge pull request #3205 from chapel/fix-usercard-out-of-browser
FIX: Use overage to keep usercard from going off browser
2015-02-16 12:42:02 +11:00
Ed Gibbs
c50205725f FIX: Default sort grantable badges by name
Currently has no default sort and was stated as a bug here:
  https://meta.discourse.org/t/badges-not-sorted-in-grant-badge-dropdown/23739
  (Post was recently deleted or made private?)
2015-02-15 17:37:11 -08:00
Jacob Chapel
8ee0cb7049 FIX: Use overage to keep usercard from going off browser 2015-02-15 17:14:32 -08:00
Sam
b5bcf7bf3d update some testing gems 2015-02-16 07:17:45 +11:00
Sam
c867074e0e Update gems, hiredis contained a confirmed memory leak 2015-02-16 07:12:26 +11:00
Sam
43375c8b15 FIX: upgrade event machine
1.0.5 and 1.0.6 contain confirmed memory leaks
2015-02-16 07:06:19 +11:00
Sam
bd8d8b2b49 Revert "Revert "update gems" , may be causing mem leak"
This reverts commit 112e82d11a.
2015-02-16 07:04:50 +11:00
Régis Hanol
7b848281a1 Merge pull request #3204 from techAPJ/patch-1
UX: add confirmation dialog for user archive export
2015-02-15 18:08:11 +01:00
Arpit Jalan
64ffceb438 UX: add confirmation dialog for user archive export 2015-02-15 22:13:28 +05:30
Sam
0b7c92166c upgrade pg, appears to be false positive 2015-02-15 08:27:35 +11:00
Sam
112e82d11a Revert "update gems" , may be causing mem leak
This reverts commit 5eea774f54.
2015-02-15 08:25:58 +11:00
Jeff Atwood
fc413df7e1 add link to backups from dashboard size 2015-02-13 17:21:29 -08:00
Jeff Atwood
9730a6892c Merge pull request #3201 from awesomerobot/master
fixing cateogry alignment in docked header
2015-02-13 14:17:45 -08:00
Kris Aubuchon
c8af2ec8a2 fixing cateogry alignment in docked header 2015-02-13 17:17:32 -05:00
Robin Ward
3ce2077aa8 Migrate unsubscribe keys to the database.
This should reduce a lot of the keys in redis.
2015-02-13 14:24:15 -05:00
Régis Hanol
86c7071559 remove all calls to the distributed mutex in emojis 2015-02-13 19:34:24 +01:00
Régis Hanol
324a3da723 remove distributed mutex for emojis (not working) 2015-02-13 19:26:26 +01:00
Robin Ward
96c19ed8b6 UX: Add a dash for the empty cell.
"Active Users" for "All Time" doesn't make sense.
2015-02-13 11:27:31 -05:00
Robin Ward
ae5d540f36 Merge pull request #3200 from techAPJ/update-translations
Update Translations
2015-02-13 10:52:50 -05:00
Régis Hanol
2a3ceb84de FIX: category background in topic views 2015-02-13 15:52:56 +01:00
Arpit Jalan
439f13b040 Update Translations 2015-02-13 19:37:41 +05:30
Jeff Atwood
a5a3f103f6 Merge pull request #3198 from awesomerobot/master
category box alignment fix
2015-02-12 21:16:10 -08:00
Kris Aubuchon
f6035411c9 box category alignment fix 2015-02-12 23:24:07 -05:00
Neil Lalonde
f62c0db162 Version bump to v1.2.0.beta8 2015-02-12 18:30:43 -05:00
Sam
cd0fa12562 FIX: downgrade pg to stop memory leak 2015-02-13 10:10:15 +11:00