osr-plastic/osr-discourse-src
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
4,385 Commits 130 Branches 462 Tags 739 MiB
fc4f5a36c6
Commit Graph

343 Commits

Author SHA1 Message Date
Robin Ward
c9c6a8fd9d User stream now uses eyeline for loading more content. 2013-07-23 16:06:26 -04:00
Régis Hanol
6474e7df97 uploads selector texts is now different when attachments are enabled 2013-07-22 23:15:23 +02:00
Robin Ward
43ceacabab Link to edit "About Me" links directly to the field. 2013-07-22 16:53:21 -04:00
Robin Ward
7a6f1b5aff Color moderator actions on user stream 2013-07-18 17:24:51 -04:00
Robin Ward
257ddf5fc9 FIX: Private message link on messages view did not work. Removed a lot of duplication. 2013-07-18 17:07:05 -04:00
Robin Ward
19f3a8d640 Each user activity filter has its own URL now. 2013-07-17 15:42:31 -04:00
Robin Ward
86c884aa29 FIX: Only show undelete button when the topic is deleted 2013-07-17 10:21:47 -04:00
Robin Ward
5a5e9d0fd1 Merge pull request #1206 from BrentleyJones/fixed_modals 
FIX: Modal dialogs now truly center and work at all screen sizes (mobile), now with working Bootbox
 2013-07-17 06:59:48 -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
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
2577d76e4f Revert "Merge pull request #1201 from BrentleyJones/fixed_modals" 
This reverts commit 7e889c4e24, reversing
changes made to e9d37f395f.
 2013-07-16 13:38:01 -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
d466d11e71 Ember RC6 update 2013-07-16 10:35:18 -04: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
ff7d9cac38 fix non localized said: in quotes 2013-07-16 17:22:54 +10:00
Sam
352ac9e60c Finalize read only and post only categories, finished off UI work 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
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
ed60f24502 Merge pull request #1194 from ZogStriP/uploads 
[Upload] Great deal of renaming
 2013-07-15 07:06:18 -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
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
15a41a41f2 Use fancy formatting in the suggested topics list 2013-07-12 12:47:26 -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
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
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
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
Robin Ward
e05a3569a1 FIX: Deep linking into a category was losing the badge 2013-07-09 10:57:52 -04:00
David McClure
a3eb175683 - like counts use number formatting (so 1100 is 1.1K like other counts) 
- made 'likes' column wide enough to hold 3 digit and > 999 likes
 2013-07-06 00:07:10 -07:00
Robin Ward
11bb9aafc7 Extra tests for composer 2013-07-05 13:04:49 -04:00
Neil Lalonde
c157c61d0e Use the same time ago formating in embedded post as other posts 2013-07-04 10:08:44 -04:00
Robin Ward
44cd5505d3 FIX: Repeatedly editing a post was popping up abandon dialog 2013-07-03 15:57:23 -04:00
Neil Lalonde
115491a057 Don't overlap post date with a quote inside an embedded post. CSS could still be improved. 2013-07-03 15:11:35 -04:00
Robin Ward
f328804488 Merge branch 'add-list-of-authorized-extensions' of git://github.com/ZogStriP/discourse into ZogStriP-add-list-of-authorized-extensions 
Conflicts:
	app/models/site_setting.rb
 2013-07-03 11:18:42 -04:00
Neil Lalonde
bb74c8b9cf Widen the Age column on categories page to fit the new date format 2013-07-02 17:22:35 -04:00
Neil Lalonde
0270ee0d98 Add classes to td's in suggested topics 2013-07-02 17:03:23 -04:00
Robin Ward
22e6b3f466 FIX: When moving topics to an existing topic, say it's an existing topic in the moderator message. 2013-07-02 15:47:15 -04:00
Robin Ward
9c552c39a2 FIX: CSS for post selection was off in lower resolutions 2013-07-02 15:29:05 -04:00
Neil Lalonde
0fde2a2d54 Move post timestamp in embedded post to the top right 2013-07-02 15:10:58 -04:00
Robin Ward
a04924deea FIX: Progress wasn't docking properly 2013-07-02 13:10:38 -04:00
Robin Ward
5770879472 Refactor: Move Topic Details into better objects, identity map, tests, query string filters 2013-07-02 10:36:46 -04:00
Régis Hanol
6723ba6014 Add a list of for file uploads 2013-07-01 02:19:03 +02:00
Neil Lalonde
94b8286819 Configurable FAQ url 2013-06-27 12:10:43 -04:00
Neil Lalonde
6b58713fa6 Fix title attributes on post info 2013-06-26 16:27:18 -04:00
Robin Ward
89f182899f Support for custom Privacy Policies 2013-06-26 10:59:36 -04:00
Neil Lalonde
b2d300fe0b Add ability to give users a title. Show them under usernames beside posts. Needs love from a designer. 2013-06-25 18:39:20 -04:00
Jeff Atwood
1ac7c28680 add method='post' to JS injected login form 2013-06-24 21:42:08 -07:00
Neil Lalonde
008f3b4785 Use tiny date format on posts 2013-06-24 18:46:58 -04:00
Jeff Atwood
ab74bbfc8e we use wrench for admin not cog 
NO WIRE COAT HANGERS!! NO WIIIIREEE COOAATT HANNGGERSS
 2013-06-24 01:22:40 -07:00
Sam
6a9484155d oops forgot to reorder this 2013-06-19 17:04:34 +10:00
Sam
e7d6b25998 shuffle around the topic metadata so we don't need absolute positioning 2013-06-19 14:44:36 +10:00
Neil Lalonde
66c18a0bec I missed one td that needs the activity class 2013-06-18 18:53:34 -04:00
Neil Lalonde
b7efd0be50 Move post date and edits link to top right of content area 2013-06-18 17:35:37 -04:00
Neil Lalonde
c9556b4bb8 Remove bookmark from top right of post; move its functionality to the post menu button 2013-06-18 17:35:37 -04:00
Sam
14e7bb4a08 improve style a tiny bit 2013-06-18 17:22:37 +10:00
Sam
80c42753e1 fix up find as you type for the invite into PM function 
allow mods to remove users from a PM
 2013-06-18 17:17:01 +10:00
Sam
7abb20928b Merge pull request #1033 from chrishunt/move-dynamic-favicon-to-user 
Move 'dynamic favicon' setting to User preference
 2013-06-17 17:31:02 -07:00
Sam
4714d31c01 fix scrolling while clicking up and down on search results 2013-06-17 16:23:03 +10:00
Sam
8c7519df86 missing pluralization 2013-06-17 15:37:46 +10:00
Chris Hunt
09d3800701 Move 'dynamic favicon' from Server to User pref 2013-06-14 23:58:24 -07:00
Neil Lalonde
06b7085287 Add classes to the th elements for everything in topic list too 2013-06-14 18:26:49 -04:00
Neil Lalonde
247ef08799 Add distinct classes to posts, likes, and views td elements in topic lists 2013-06-14 17:45:05 -04:00
Neil Lalonde
f62c421c91 Render category descriptions differently on the categories page 2013-06-14 11:18:44 -04:00
Neil Lalonde
2c68dd1c12 Put h3 footer messages inside the footer tag for easier styling 2013-06-12 13:02:48 -04:00
Neil Lalonde
5d7f22ed63 Include the latest class on the a tag in posters list 2013-06-12 10:45:07 -04:00
Sam
c1f6169b48 hidden and deleted state in user stream 2013-06-12 11:14:08 +10:00
Robin Ward
bddc9dd4b8 FIX: Replace modal with an empty view when closed. Fixes the bug where you'd edit a category, close 
and then click edit again.
 2013-06-11 16:41:09 -04:00
Robin Ward
850123dce8 FIX: User Pill errors 2013-06-10 18:51:25 -04:00
Sam
a6f67d85eb also should have caught this earlier 2013-06-08 07:47:48 +10:00
Sam
1e725629cd no idea how this was even working 2013-06-08 07:45:45 +10:00
Régis Hanol
3f5c12ca1b FIX: combobox were not working properly 2013-06-07 20:45:31 +02:00
Robin Ward
06e83c9e6a FIX: Hitting enter while the invite dialog is up should submit the form, not refresh the 
entire page :)
 2013-06-06 12:06:43 -04:00
Robin Ward
7b70330e85 FIX: Javascript errors when navigating to some topics 2013-06-05 20:53:48 -04:00
Sam
2ca734c118 Merge pull request #964 from chrishunt/exclusive-club 
Add 'invite only' site setting
 2013-06-05 16:38:47 -07:00
Robin Ward
0b97ea6345 Better HTML emails, smarter email digests, new email section in admin with digest preview 2013-06-05 17:47:25 -04:00
Stephan Kaag
469bf044c3 Remove superfluous } 2013-06-05 21:54:07 +03:00
Chris Hunt
8f14e46964 Hide registration on login modal if 'invite only' 2013-06-05 11:06:54 -07:00
Robin Ward
7d089fdfb5 FIX: Compile templates properly with the latest handlebars 2013-06-05 14:00:02 -04:00
Robin Ward
a0bd51862e Upgrade Ember to RC5. Disabled a deprecation warning that I believe is in error. 2013-06-05 12:07:18 -04:00
Sam
e52e46a609 fix blank created_at .. date is unbound, we should rename it to unboundDate 2013-06-05 11:32:53 +10:00
Sam
9a57aaaaa9 fix encoding for category excerpt 
fix missing secure category topics in categories page
 2013-06-05 11:22:47 +10:00
Sam
21b3359ea4 Merge pull request #957 from chrishunt/chrishunt/lock-down-the-base 
Add 'login required' site setting
 2013-06-04 17:22:08 -07:00
Sam
5f85aaee1d correct message bus regression 
implement automatically updating dates in list
 2013-06-05 09:32:44 +10:00
Chris Hunt
789289a290 Show login modal on header buttons if required 2013-06-04 16:10:10 -07:00
Robin Ward
11e703f6a0 Merge pull request #953 from chrishunt/chrishunt/fix-featured-topic 
Add missing handlebar in featured_topics template
 2013-06-04 10:31:44 -07:00
Robin Ward
4392a17b54 Strip out links when displaying a new user's bio 2013-06-04 12:06:25 -04:00
Chris Hunt
5ef4bcdecc Add missing handlebar in featured_topics template 2013-06-04 08:33:47 -07:00
Robin Ward
545dbfc07e New Feature: Staff can choose to "Take Action" when flagging to immediately reach hiding 
thresholds.
 2013-05-31 17:39:32 -04:00
Robin Ward
0af0a214b2 Refactor: Back all modals by controllers 2013-05-31 12:29:38 -04:00
Sam
8874c9ea75 Add message format support that can be used on complex localization strings 
Add message about new and unread topics at the bottom of topics
move localization helper into lib
 2013-05-30 16:49:57 +10:00
Sam
e93b7a3b20 more progress towards live unread and new counts, unread message implemented, still to implement delete messages 2013-05-30 16:49:57 +10:00
Sam
73834370a5 work in progress, live unread and new counts 2013-05-30 16:49:57 +10:00