Sam
|
77494e201a
|
Merge pull request #1258 from elo7/pt_BR
Added pt_BR user.change key value
|
2013-07-28 22:18:37 -07:00 |
|
Sam
|
aa6c92922d
|
SECURITY: correct our CSRF implementation to be much more aggressive
|
2013-07-29 15:13:13 +10:00 |
|
Sam
|
4a20d09523
|
distributed memoizer added to ensure absolute duplicate posts don't get through
in case of an absolute dupe just return the memoized post
This works around issues with wordpress being crazy
|
2013-07-29 12:25:19 +10:00 |
|
Sam
|
1e107fd68a
|
mock redis for mock redis goodness
|
2013-07-29 12:23:21 +10:00 |
|
Sam
|
896e493531
|
don't ever delete unprocessable emails
|
2013-07-28 09:54:15 +10:00 |
|
Sam
|
0320a5ae64
|
correct email styles
|
2013-07-27 08:09:32 +10:00 |
|
Sam
|
d51dcd1705
|
improve email styling, include extra respond link
|
2013-07-26 17:27:46 +10:00 |
|
Sam
|
85389e8b86
|
spec for trashable
|
2013-07-26 14:41:58 +10:00 |
|
Sam
|
809594c00a
|
correct ScreenTrack so it properly flushes everything that happened on stop and resets on start
|
2013-07-26 14:41:46 +10:00 |
|
Sam
|
3f5ea1ef79
|
oops ... I keep forgetting to run qunit, really need to get it into autospec
|
2013-07-25 12:06:02 +10:00 |
|
Sam
|
589e9916f2
|
fix so some half working locales boot
|
2013-07-25 11:25:30 +10:00 |
|
Sam
|
e922f10f4e
|
correct locale helper so it falls back to english message format if mf is missing
|
2013-07-25 11:16:07 +10:00 |
|
Sam
|
d0f50cb266
|
fixing up moment locales, they were not set up properly
|
2013-07-25 11:09:29 +10:00 |
|
Sam
|
9351a7bcb1
|
Merge pull request #1244 from stephankaag/rails4updates
Rails 4 updates
|
2013-07-24 14:16:32 -07:00 |
|
Sam
|
0a7bbb08e1
|
fix broken build
|
2013-07-24 17:24:55 +10:00 |
|
Sam
|
366cb13140
|
restyle all user notification emails to use a custom html template
|
2013-07-24 17:24:55 +10:00 |
|
Sam
|
cb5ce3aab9
|
Merge pull request #1247 from sir-pinecone/strip-spaces-from-login
Strip leading/trailing spaces from login
|
2013-07-24 00:16:55 -07:00 |
|
Sam
|
880dd53f48
|
Merge pull request #1249 from sir-pinecone/strip-spaces-from-group
Strip spaces from group names upon creation
|
2013-07-24 00:15:53 -07:00 |
|
Sam
|
a09c9f08a8
|
Merge pull request #1250 from sir-pinecone/display-group-save-errors
display group validation errors in alert modal
|
2013-07-23 22:39:23 -07:00 |
|
Sam
|
38b8e9b1b4
|
get rake autospec working in rails 4
|
2013-07-24 11:49:26 +10:00 |
|
Sam
|
f2a3719140
|
Merge pull request #1245 from ZogStriP/server-side-file-size-check
add server-side filesize check on uploads
|
2013-07-23 17:28:12 -07:00 |
|
Sam
|
7c5e15966f
|
Merge pull request #1225 from ZogStriP/upload-selector-handles-attachments
uploads selector texts is now different when attachments are enabled
|
2013-07-23 00:44:17 -07:00 |
|
Sam
|
9ac6c6e2e9
|
Merge pull request #1233 from sir-pinecone/improve-group-deletion
Add confirmation modal to admin group deletion
|
2013-07-23 00:43:06 -07:00 |
|
Sam
|
ef201e02d7
|
Merge pull request #1238 from ZogStriP/moar-bullets
change the pipe into a bullet in the lightbox overlay
|
2013-07-23 00:41:47 -07:00 |
|
Sam
|
7e92109ac8
|
Merge pull request #1240 from abbat/master
Fix locale dependend stemmer for FTS
|
2013-07-23 00:40:54 -07:00 |
|
Sam
|
4b735a5a09
|
Merge pull request #1239 from abbat/patch-1
Add russian stemmer for FTS
|
2013-07-23 00:39:00 -07:00 |
|
Sam
|
478ae6d6c7
|
correct bug where delete stub job would fail when attempting to delete stubs off deleted topics
skip deleting stubs if a post is actively flagged
|
2013-07-23 16:11:44 +10:00 |
|
Sam
|
73e0418b41
|
deleted class only for real deleted posts
|
2013-07-23 15:42:44 +10:00 |
|
Sam
|
3ad7d74c52
|
correct no highlighting categories when clicked
|
2013-07-23 13:24:39 +10:00 |
|
Sam
|
060c79ecc0
|
remove dupes before correcting topic_ids in user action consistency check job
|
2013-07-23 12:44:20 +10:00 |
|
Sam
|
9c5734b773
|
tone down badges for the love of all that is good
|
2013-07-23 12:44:20 +10:00 |
|
Sam
|
ac47da1722
|
Merge pull request #1241 from dougalcorn/config-pbkdf-algorithm
Parameterize the PBKDF2 algorithm in application config
|
2013-07-22 18:39:36 -07:00 |
|
Sam
|
4b269de724
|
correct: http://meta.discourse.org/t/cant-save-adding-a-group-permission-to-a-category/8537
can not save category after adding a new custom group
|
2013-07-23 10:10:36 +10:00 |
|
Sam
|
0acc96c94e
|
work around for http://meta.discourse.org/t/activerecord-statementinvalid-exception-raised-in-models-user-action-rb/7275/4
|
2013-07-23 09:48:18 +10:00 |
|
Sam
|
7b1f9928e4
|
staff can change trust levels
|
2013-07-23 09:13:48 +10:00 |
|
Sam
|
ea7684fb32
|
Merge pull request #1226 from stephankaag/rails4_updates
Some Rails4 updates
|
2013-07-22 15:03:37 -07:00 |
|
Sam
|
3eb953cebe
|
message bus to use latest
|
2013-07-22 18:35:02 +10:00 |
|
Sam
|
239d8b6795
|
fix spec
|
2013-07-22 18:04:20 +10:00 |
|
Sam
|
1f3c5cb656
|
allow end user to recover a post they delete
automatically delete stubs after 1 day
|
2013-07-22 17:48:47 +10:00 |
|
Sam
|
58e7c3e1f3
|
push some work out of AR callbacks into PostCreator, add a couple of helpers for post and topic creation in test
fix it so the auto_track false marks topics as new
|
2013-07-22 15:07:20 +10:00 |
|
Sam
|
0ec1438b9a
|
correct auto track param parsing for WordPress
|
2013-07-22 15:07:20 +10:00 |
|
Sam
|
acba0ea41e
|
add auto track to permitted params
|
2013-07-22 15:07:20 +10:00 |
|
Sam
|
31bb08bcdd
|
added an option to bypass auto tracking of topics on post creation
|
2013-07-22 15:07:20 +10:00 |
|
Sam
|
9e4b0df7ff
|
69 specs fail in rails 4 now ...not too bad
|
2013-07-22 15:07:20 +10:00 |
|
Sam
|
e7e00601c6
|
ok, we now dual boot rails 4 and rails 3 ... to run in rails 4 mode: RAILS4=1 bundle exec thin start
|
2013-07-21 10:56:48 +10:00 |
|
Sam
|
cacbcaeb7e
|
blank responses led to an undefined on the user screen
|
2013-07-19 17:21:51 +10:00 |
|
Sam
|
58eec31351
|
sample ubuntu upstart config file
|
2013-07-19 15:23:55 +10:00 |
|
Sam
|
08550bf625
|
Merge pull request #1217 from ZogStriP/fix-click-tracking-on-attachments
FIX: click tracking on attachments wasn't working
|
2013-07-18 21:59:36 -07:00 |
|
Sam
|
ad72f96a59
|
recommend latest redis
|
2013-07-18 09:11:20 +10:00 |
|
Sam
|
81616a46ba
|
db consistency check for mismatching topic_ids in user_actions
fix up post mover so it remaps user actions as well
move specs for post mover into post_mover_spec
|
2013-07-17 16:40:56 +10:00 |
|
Sam
|
c2be81a76e
|
Merge pull request #1199 from ZogStriP/uploads
adds the `max_attachment_size_kb` setting
|
2013-07-16 23:03:42 -07:00 |
|
Sam
|
2573935155
|
improve security UI
|
2013-07-17 15:10:49 +10:00 |
|
Sam
|
625204c8bd
|
work in progress category UI
refactor hack from earlier
|
2013-07-17 14:54:21 +10:00 |
|
Sam
|
5a7e78f0fc
|
fix unit tests
|
2013-07-17 14:22:55 +10:00 |
|
Sam
|
63cbe8dd17
|
fix links to site contents, fix it so the site contents page is refreshable
|
2013-07-17 14:15:09 +10:00 |
|
Sam
|
d1dbcf52fc
|
see: https://github.com/emberjs/ember.js/pull/2148
|
2013-07-17 09:55:30 +10:00 |
|
Sam
|
e9d37f395f
|
hmm I totally missed that it was already there
|
2013-07-16 21:06:04 +10:00 |
|
Sam
|
06bd9e3234
|
allow login required screen to be customized
|
2013-07-16 20:49:04 +10:00 |
|
Sam
|
dc3079db37
|
fix mucked up styling, glyph should be inside the hyperlink so it gets color
|
2013-07-16 18:01:34 +10:00 |
|
Sam
|
6a2ffa9415
|
fix qunit tests
|
2013-07-16 17:52:25 +10:00 |
|
Sam
|
c49731a91b
|
fix failing server side quote localisation change
|
2013-07-16 17:48:48 +10:00 |
|
Sam
|
ff7d9cac38
|
fix non localized said: in quotes
|
2013-07-16 17:22:54 +10:00 |
|
Sam
|
943f88fb88
|
make specs more robust
|
2013-07-16 16:18:05 +10:00 |
|
Sam
|
ef1c71ba98
|
missed a qunit test
|
2013-07-16 15:48:41 +10:00 |
|
Sam
|
352ac9e60c
|
Finalize read only and post only categories, finished off UI work
|
2013-07-16 15:46:11 +10:00 |
|
Sam
|
fce2d0e3b6
|
reply to first post === reply to topic
|
2013-07-16 15:46:11 +10:00 |
|
Sam
|
a3155858a0
|
Fix share URL for first post
|
2013-07-16 15:46:11 +10:00 |
|
Sam
|
ecf17cfebb
|
work in progress, add fidelity to category group permissions (full, create posts, readonly)
|
2013-07-16 15:46:11 +10:00 |
|
Sam
|
8d947535a8
|
add descriptive comment
|
2013-07-16 15:44:38 +10:00 |
|
Sam
|
d3b544bbff
|
check in a basic require profiler script only used in dev ...
|
2013-07-16 15:44:38 +10:00 |
|
Sam
|
676017238e
|
production.rb should not be in git
|
2013-07-16 15:44:38 +10:00 |
|
Sam
|
c7697bbae2
|
remove duplicate code
|
2013-07-16 15:44:38 +10:00 |
|
Sam
|
25bcd6007c
|
Update client.nb_NO.yml
broken yaml
|
2013-07-15 21:26:28 +10:00 |
|
Sam
|
0fee644434
|
Merge pull request #1191 from cfstras/patches
Fix bug: pressing enter on the "forgot password" modal does not submit the form
|
2013-07-15 03:18:23 -07:00 |
|
Sam
|
bf06be3260
|
Merge pull request #1189 from erlend-sh/patch-4
Update client.nb_NO.yml
|
2013-07-15 03:14:22 -07:00 |
|
Sam
|
8947d1aeac
|
Merge pull request #1187 from stephankaag/refactor_array_concatenation
Refactor array concatenation
|
2013-07-15 03:13:44 -07:00 |
|
Sam
|
6f6ad9d076
|
Merge pull request #1186 from stephankaag/add_primary_keys
Add primary key `id` to `category_featured_topics` and `topic_users`
|
2013-07-15 03:12:07 -07:00 |
|
Sam
|
e57de7d4b9
|
Merge pull request #1188 from stephankaag/simplify_avatar_lookup
Simplify avatar lookup class
|
2013-07-15 03:11:34 -07:00 |
|
Sam
|
16976a2092
|
Merge pull request #1192 from cfstras/locale
Locales: updated German locale, mainly the admin section
|
2013-07-15 03:08:33 -07:00 |
|
Sam
|
86e5c9afc2
|
Merge pull request #1193 from jbruni/master
Tiny typo fix (comment at nginx.sample.conf)
|
2013-07-15 00:58:09 -07:00 |
|
Sam
|
f05bc44fbe
|
Merge pull request #1182 from sanderdatema/dutch_translation
Dutch translation updated
|
2013-07-11 19:59:08 -07:00 |
|
Sam
|
00c6bffc61
|
Merge pull request #1183 from erlend-sh/patch-3
Update client.nb_NO.yml
|
2013-07-11 19:58:29 -07:00 |
|
Sam
|
33e2a9933d
|
Merge pull request #1178 from royguo/patch-2
Update client.zh_CN.yml
|
2013-07-10 21:03:04 -07: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 |
|
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 |
|
Sam
|
0f46df4670
|
workaround for bust up button on topics
|
2013-07-09 18:16:18 +10:00 |
|
Sam
|
8f892da890
|
move bookmark to end
|
2013-07-09 18:16:17 +10:00 |
|
Sam
|
21bfb64a28
|
added EMBED_CLOCKWORK so users can embed clockwork scheduling inside another process
|
2013-07-09 11:01:51 +10:00 |
|
Sam
|
e993d6b29b
|
upgrade font awesome to version 3.2.1, use scss instead of css for the include.
|
2013-07-09 10:06:57 +10:00 |
|
Sam
|
4b437ccd2f
|
Merge pull request #1148 from nterray/fix_html_entities_after_editing_topic_title
Add :title as attribute for basic_topic
|
2013-07-07 23:45:25 -07:00 |
|
Sam
|
f42fc3be37
|
Merge pull request #1150 from mcwumbly/topic-likes
little tweaks to like counts in topic list view
|
2013-07-07 23:39:38 -07:00 |
|
Sam
|
807b9d438a
|
Merge pull request #1159 from jd-erreape/user_refactors
Refactors in user model
|
2013-07-07 23:38:16 -07:00 |
|
Sam
|
180d887481
|
title for category pages
|
2013-07-08 16:01:40 +10:00 |
|
Sam
|
2f096083d0
|
custom title for user page
|
2013-07-08 15:56:13 +10:00 |
|
Sam
|
085e094497
|
404 if a category does not exist ....
|
2013-07-08 15:56:13 +10:00 |
|
Sam
|
f1a31cd9e6
|
Merge pull request #1163 from ZogStriP/refactor-cooked-post-processor
refactored CookedPostProcessor
|
2013-07-07 22:01:48 -07:00 |
|
Sam
|
5d6ce6d17f
|
Merge pull request #1164 from ZogStriP/add-label-for-boolean-settings
add label for boolean setting
|
2013-07-07 22:00:09 -07:00 |
|