Brentley Jones
e060e952b5
Accidently removed some styles in the merge
2013-07-16 19:06:33 +00:00
Brentley Jones
5e08427dd3
Merge branch 'master' into fixed_modals
...
Conflicts:
app/assets/javascripts/discourse/templates/modal/modal.js.handlebars
app/assets/stylesheets/application/modal.css.scss
2013-07-16 18:58:49 +00:00
Brentley Jones
cc28a4ddc3
FIX: Bootbox modals were not coming through properly. Temp have them use the old way of displaying. Will look into how to have them be the same as the "fixed" way.
2013-07-16 18:32:35 +00:00
Robin Ward
7c9bd8e8c9
Remove EvilTrout's stupid mistake.
2013-07-16 13:51:00 -04:00
Robin Ward
2577d76e4f
Revert "Merge pull request #1201 from BrentleyJones/fixed_modals"
...
This reverts commit 7e889c4e24e9d37f395f
2013-07-16 13:38:01 -04:00
Robin Ward
4bfb546942
Removed modelReady hack now that the async router exists
2013-07-16 13:24:59 -04:00
Robin Ward
6929ee9f46
Changed HTML again on hamburger menu to make it easier to style
2013-07-16 12:24:18 -04:00
Robin Ward
82c734ec84
FIX: FAQ wasn't loading sometimes
2013-07-16 12:11:30 -04:00
Robin Ward
d466d11e71
Ember RC6 update
2013-07-16 10:35:18 -04:00
Robin Ward
75282576b9
Merge pull request #1195 from initforthe/post-analyser-backtrace-fix
...
Post analyser backtrace fix
2013-07-16 07:34:54 -07:00
Robin Ward
7e889c4e24
Merge pull request #1201 from BrentleyJones/fixed_modals
...
FIX: Modal dialogs now truely center and work at all screen sizes (mobile)
2013-07-16 07:31:17 -07: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
ff7d9cac38
fix non localized said: in quotes
2013-07-16 17:22:54 +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
c7697bbae2
remove duplicate code
2013-07-16 15:44:38 +10:00
Brentley Jones
d1ab694920
FIX: Modal dialogs now truely center and work at all screen sizes (mobile)
2013-07-16 03:40:15 +00:00
Robin Ward
e8f3e7c2e8
Added classes for styling to hamburger menu
2013-07-15 13:31:52 -04:00
Robin Ward
0e504aac9b
FIX: You can reset your password even if logins are required.
2013-07-15 12:12:54 -04:00
Robin Ward
08723f00c6
FIX: Bugs on Admin User approval interface
2013-07-15 11:28:41 -04:00
Robin Ward
ed60f24502
Merge pull request #1194 from ZogStriP/uploads
...
[Upload] Great deal of renaming
2013-07-15 07:06:18 -07: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
Tom Russell
96065a1499
Prevent backtrace in PostAnalyser
2013-07-15 11:15:04 +01:00
Jeff Atwood
52fa9a5453
widen @name autocomplete dialog 20%
2013-07-15 00:42:02 -07:00
Régis Hanol
36e6345eee
change the icon in the composer toolbar with a more generic upload icon
...
also changed all references to "images uploads" to a "uploads"
2013-07-14 23:44:50 +02:00
Régis Hanol
3397c2235f
display the size of the attachment in the preview
...
instead of adding it during post processing
2013-07-14 12:28:24 +02:00
Régis Hanol
6f2ce93ab2
FIX: create an upload when FastImage throws an exception
...
FastImage might throw an exception when it isn't able to recognize a
file as being an image (ie. happens when users changes the extension
manually)
Also improved upload specs a lot
2013-07-13 23:42:19 +02:00
Claus Strasburger
b5593daae1
Fix bug: pressing enter on the "forgot password" modal does not submit the form
2013-07-13 22:24:09 +02:00
Robin Ward
2aa487d2c8
Show who deleted a topic
2013-07-12 16:38:21 -04:00
Robin Ward
0c7ead339b
Don't recalculate trustLevels combobox
2013-07-12 16:24:15 -04:00
Robin Ward
62d161fd70
Show number before trust level. Also use less memory for trust levels.
2013-07-12 16:18:32 -04:00
Robin Ward
35128c212b
FIX: User page broke when the user had no stats
2013-07-12 15:59:35 -04:00
Robin Ward
15a41a41f2
Use fancy formatting in the suggested topics list
2013-07-12 12:47:26 -04:00
Robin Ward
6122d31711
FIX: Jshint in computed.js - not in qunit?
2013-07-12 12:14:32 -04:00
Robin Ward
6ca5df0a09
Can recover deleted topics. Deleted topics show the first post as deleted in the UI.
2013-07-12 12:09:17 -04:00
Robin Ward
5eaae063f0
Discourse Macro Helpers + Minor Fix to Admin User View
2013-07-11 19:35:52 -04:00
Robin Ward
bb5a9aa34b
Remove reliance on views for logic, move to controller
2013-07-11 16:55:07 -04:00
Robin Ward
19c169540c
Staff can enter and view deleted topics
2013-07-11 16:39:35 -04:00
Robin Ward
eba662b988
FIX: Topic Status Icons had weird margins after font awesome update
2013-07-11 12:04:39 -04:00
Robin Ward
4540a51a8f
FIX: deleted_by wasn't showing up on refresh
2013-07-11 11:18:25 -04:00
Robin Ward
7fd8bb75d9
Merge pull request #1177 from ZogStriP/attachments
...
Attachments
2013-07-11 06:49:20 -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
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
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
