Sam
33e2a9933d
Merge pull request #1178 from royguo/patch-2
...
Update client.zh_CN.yml
2013-07-10 21:03:04 -07:00
Roy Guo
994f3d4ad5
Update client.zh_CN.yml
...
banned: "禁止参与讨论" # can't create or reply topics
blocked: "禁止登陆" # can't login
2013-07-11 11:47:17 +08:00
Sam
1aef6de4b0
automatically approve invited users on forum where moderators must approve (keep in mind only moderators can invite)
...
speed up specs a touch
allow invite controller to accept an email in absence of user (cleans up API)
2013-07-11 11:22:00 +10:00
Neil Lalonde
7792b7da48
Use the solid envelope icon. Font-awesome swapped icon-envelope and icon-envelope-alt.
2013-07-10 17:06:07 -04:00
Régis Hanol
360695bb0a
update front-end specs
2013-07-10 22:59:54 +02:00
Régis Hanol
b94d26d798
update back-end specs
2013-07-10 22:59:54 +02:00
Régis Hanol
6beb12e778
update nginx.sample.conf to take attachmetns into account
2013-07-10 22:59:54 +02:00
Régis Hanol
ac41e94619
refactor optimized_image a bit
2013-07-10 22:59:54 +02:00
Régis Hanol
ffb9a1250a
don't track via AJAX when clicking on local attachments
2013-07-10 22:59:53 +02:00
Régis Hanol
da614597fe
post process attachments
2013-07-10 22:59:53 +02:00
Régis Hanol
1f8eaa6ca3
display correct template when attachment or image
2013-07-10 22:59:53 +02:00
Régis Hanol
27ab5f471c
support arbitrary attachments
2013-07-10 22:59:53 +02:00
Régis Hanol
e8c1a81e87
do not create global variables
2013-07-10 22:59:53 +02:00
Robin Ward
6de1fed87a
Glyph stuff: Put them on the left of the user menu, fix padding on link arrows in gutter.
2013-07-10 16:58:58 -04:00
Jeff Atwood
f1a5f4ce66
left align post quotes and blockquotes
2013-07-10 13:57:52 -07:00
Neil Lalonde
8814f9ed05
Fix a case when a staff user views a topic with a deleted post by a nuked user; might be a temporary solution until we decide what to do with nuked records
2013-07-10 16:52:47 -04:00
Robin Ward
91dc0b9ef1
JSHint issue with file that didn't show up in Qunit locally. Weird!
2013-07-10 16:29:53 -04:00
Robin Ward
f58dec1ac0
Also include deleted_at
2013-07-10 16:27:02 -04:00
Robin Ward
8ffe9e28d6
Shows who deleted a post
2013-07-10 16:22:49 -04:00
Robin Ward
8888ae4b40
Added some macros to simplify code
2013-07-10 16:21:18 -04:00
Robin Ward
1fef617818
Qunit tests for deleting posts on the front end. Support for deleted_by
...
property.
2013-07-10 16:21:13 -04:00
Neil Lalonde
cdf0754626
Show/update post edits count and icon after editing a post
2013-07-10 15:15:13 -04:00
Neil Lalonde
0e3e5bf533
Add relative_date_duration site setting
2013-07-10 12:38:43 -04:00
Robin Ward
cc47616cdb
Merge pull request #1157 from abbat/email-custom-headers
...
Add custom headers for email messages
2013-07-10 07:12:51 -07:00
Robin Ward
68c86931e4
Merge pull request #1169 from phanimahesh/patch-1
...
Prevent errors in case #{rails_root}/tmp does not exist
2013-07-10 07:11:59 -07:00
Robin Ward
4eb5f99103
Merge pull request #1173 from nterray/translate_reply_subject
...
French translation of user_replied/posted subject
2013-07-10 07:11:16 -07:00
Robin Ward
a55b24996e
Merge pull request #1175 from adrianlang/correctMakeVisibleButtonCaption
...
Correct caption of 'Make Visible' button
2013-07-10 07:10:44 -07:00
Anton Batenev
60c49a85d0
Refactoring #1157
2013-07-10 17:47:38 +04:00
Adrian Lang
d4ef582f94
Correct caption of 'Make Visible' button
...
The variable 'visible' is also used for toggling the admin menu visibility,
so it is always true when the visibility toggle is shown. Hence, it's caption
is always 'Make Invisible', even when the topic already is invisible.
2013-07-10 10:16:39 +02:00
Sam
7ccfc40389
TODO comment
2013-07-10 16:35:18 +10:00
Sam
8367326e76
glyphs on the user stream, rename responses to replies
2013-07-10 16:35:06 +10:00
Sam
7cee5efab8
The flattening part 2, cleaned up styling so it is more consistent with the removal of border yesterday
...
quote style now matches block quote style
2013-07-10 12:17:43 +10:00
Sam
db196ee126
rake autospec should handle css file watching and reloading, guard is a bit pear shape at the moment
2013-07-10 12:16:56 +10:00
Nicolas Terray
19c5894874
French translation of user_replied/posted subject
...
This is a follow-up of the commit 013ad0fdd
2013-07-10 00:30:53 +02:00
Neil Lalonde
7977deb3bf
Don't allow editing of title and category of an archived topic
2013-07-09 16:54:46 -04:00
Robin Ward
b7327942af
Add deleted_by to Trashable tables
2013-07-09 15:46:36 -04:00
Neil Lalonde
4c0fe3bc12
Add a BIG WARNING to queue_jobs site setting
2013-07-09 15:34:51 -04:00
Neil Lalonde
baf698f3c9
Merge pull request #1127 from rylnd/refactor_tmp_directory
...
Refactor #tmp_directory into helper module
2013-07-09 12:17:42 -07:00
Neil Lalonde
ba7a4e9845
Merge pull request #1165 from novemberkilo/feature/log-trust-level-boosts
...
Log all changes of user trust level by an admin
2013-07-09 12:16:08 -07:00
Ryland Herrick and Vipul A M
591a5c0e13
Refactor temp directory methods into helper module
2013-07-09 13:59:31 -05:00
Neil Lalonde
7348699801
Fix order of View table in exporter
2013-07-09 14:58:49 -04:00
Neil Lalonde
3c38062802
Check for updates: edge cases when the message on the dashboard doesn't make sense.
2013-07-09 14:01:08 -04:00
Robin Ward
72632670db
FIX: Font Awesome upgrade changed padding on (+) Reply as New Topic
2013-07-09 13:34:00 -04:00
Robin Ward
82b578249c
Subtle changes to border colors
2013-07-09 13:11:13 -04:00
J Phani Mahesh
b1fcd523c6
Use FuleUtils.mkdir_p for cleaner code
2013-07-09 22:26:27 +05:30
Robin Ward
efd631296e
FIX: Don't allow a user to stage a post while another is being staged.
2013-07-09 12:34:28 -04:00
Anton Batenev
b0dbb0ea13
And add tests for empty string & null
2013-07-09 20:19:10 +04:00
Robin Ward
d98f288aa4
FIX: Recovering a deleted post was not updating a topic's statistics
2013-07-09 12:15:55 -04:00
Robin Ward
1be08dbcb5
Merge pull request #1170 from abbat/russian-translation
...
Russian translation (actual version)
2013-07-09 08:26:35 -07:00
Robin Ward
7ad471f019
FIX: If you split one topic already, the second topic was showing "Saving..."
2013-07-09 11:18:09 -04:00
