Shane Kilkelly
4f3a4880d9
remove margin above search results.
2016-02-24 10:27:29 +00:00
Henry Oswald
b504732733
fixed calls to addUserToGroup and added more logging
2016-02-22 16:50:41 +00:00
Henry Oswald
103bb1c88f
add more error logging to group handler
2016-02-22 16:01:26 +00:00
Shane Kilkelly
1e1f57a80b
Merge branch 'master' of github.com:sharelatex/web-sharelatex
2016-02-22 12:04:43 +00:00
Shane Kilkelly
2d954baa62
match cite commands like footcite
too.
2016-02-22 12:04:15 +00:00
Henry Oswald
85a8bc97ed
add leave group button for group subscriptions
2016-02-19 12:27:32 +00:00
Shane Kilkelly
b505f0d455
Merge branch 'sk-references-search'
...
Conflicts:
app/coffee/Features/References/ReferencesController.coffee
2016-02-19 11:30:55 +00:00
James Allen
bf36413491
Improve styling of upgrade messages
2016-02-18 14:53:49 +00:00
Shane Kilkelly
ef1cec8582
update the search_example.gif
2016-02-18 13:54:13 +00:00
Henry Oswald
29e4b324fd
improve calls for invite notifications and auto mark as read
2016-02-18 11:43:43 +00:00
Henry Oswald
f824a3e28a
kill off dead code in group handler
2016-02-18 11:42:26 +00:00
Shane Kilkelly
8384433231
Clean up and add comments to references-search styles.
2016-02-18 10:47:28 +00:00
Henry Oswald
bd54cc722a
fixed broken tests in AuthenticationController
2016-02-18 10:16:50 +00:00
Henry Oswald
fc4bd94a6e
don't create notification if user is already part of group
2016-02-18 10:06:21 +00:00
Shane Kilkelly
d94e3181c3
update references search preview gif.
2016-02-17 16:44:41 +00:00
Henry Oswald
c8084406d3
user notifications auto created on login for joinging groups
2016-02-17 16:24:09 +00:00
Henry Oswald
8a417035ea
remove unned debug line
2016-02-17 16:23:52 +00:00
Shane Kilkelly
f23a11eacb
Refine call-to-action styling in references upgrade dialog.
2016-02-17 15:45:04 +00:00
Shane Kilkelly
9c9a9c5c76
preview gif for references search.
2016-02-17 14:49:37 +00:00
Henry Oswald
5f719e7105
change robots.txt to ignore all
2016-02-16 12:38:27 +00:00
Henry Oswald
735f7bd51e
change res.send to res.sendStatus for new express
2016-02-16 12:38:27 +00:00
Henry Oswald
4017eab888
don't show outline on new doc/folder/upload buttons on select
2016-02-16 12:38:27 +00:00
Henry Oswald
f5910762c1
fixed missign translation for when email is already registered
2016-02-16 12:38:27 +00:00
James Allen
b3a2d44937
next -> callback
2016-02-16 11:12:07 +00:00
Shane Kilkelly
e7e6b1008b
styles for spinner.
2016-02-15 16:11:59 +00:00
Henry Oswald
87ef2cc563
Merge branch 'nodemailer2'
2016-02-15 14:52:58 +00:00
Henry Oswald
ef148da7aa
remove un needed require
2016-02-12 17:15:13 +00:00
Henry Oswald
05bf048885
upgrade to nodemailer 2.0 and dynamically use either SES or SMTP depending
...
on what is in settings file
2016-02-12 17:13:45 +00:00
Shane Kilkelly
2901d12eaa
update styles for search modal.
2016-02-12 16:24:35 +00:00
James Allen
e4960e782f
Merge branch 'ja-multi-select'
2016-02-12 11:56:10 +00:00
James Allen
9d8b91532b
Fix parent highlight bug in jquery ui
2016-02-11 15:41:56 +00:00
Shane Kilkelly
8542a08927
Refine styles.
2016-02-11 15:03:19 +00:00
Henry Oswald
0538ca2de5
added box shadow to notifications alert and made it info
2016-02-11 12:34:38 +00:00
Henry Oswald
8e5907f79e
have null array as default for notifications
2016-02-11 12:10:30 +00:00
Henry Oswald
5c5888b5dc
Merge branch 'pr/221'
2016-02-11 11:44:45 +00:00
Shane Kilkelly
a5386dcdc7
minor adjustments to search result style
2016-02-10 16:54:43 +00:00
Shane Kilkelly
1dc62bdeca
styling for search results in references search modal
2016-02-10 16:37:11 +00:00
James Allen
938b042f8c
Include selected entity in multi selection on first click
2016-02-10 15:59:51 +00:00
James Allen
8359029503
Improve drop zones and feel of dragging in file tree
2016-02-10 15:54:25 +00:00
James Allen
d47f6801c2
Don't trigger delete event on move to avoid switching to root document
2016-02-10 15:26:26 +00:00
James Allen
1d13015726
Update jquery ui
2016-02-10 15:25:53 +00:00
Shane Kilkelly
aa20661372
css for hit class.
2016-02-10 13:24:07 +00:00
James Allen
4487ae1253
Look for queued-http in the correct place
2016-02-10 11:38:01 +00:00
Shane Kilkelly
63c9b91a7b
basic css for references search form
2016-02-10 10:39:04 +00:00
James Allen
03a3e1ceb3
Added missing files
2016-02-09 15:20:59 +00:00
James Allen
506d2224aa
Allow Cmd+Clicking to multi select entries in the file tree
2016-02-09 15:13:58 +00:00
Shane Kilkelly
326d9e59f8
Refactor ReferencesSearch*
to just References*
.
2016-02-08 17:04:27 +00:00
James Allen
b978171e0c
Fix "cannot set headers after sent" in setting doc end point
...
If somehow a project ends up with the same doc/file in two locations in the
file tree, then projectLocator.findElement will return the callback for
both entries. This then tries to end the request multiple times. Of course
this should never be a state the project is in, but if it is we should catch it.
2016-02-05 15:39:26 +00:00
Henry Oswald
de0589b051
added notifications calls for sending to api and mark as read
...
not creating it yet
2016-02-05 14:13:38 +00:00
James Allen
835b43cab2
Don't remove replace command so Ctrl+H is an option in Vim mode
2016-02-05 11:15:00 +00:00