Commit graph

10297 commits

Author SHA1 Message Date
Shane Kilkelly
a686d187ad Pull refProviders into user model 2016-04-01 11:36:19 +01:00
Henry Oswald
3d719af71e if subscription is downgraded don't use plan code on subscription, use default instead 2016-03-31 18:04:20 +01:00
Henry Oswald
81cd2adfd3 member_ids != members_id 2016-03-31 17:36:06 +01:00
Henry Oswald
d80191c03b added more logging and missing err handler in subscription updater 2016-03-31 17:28:03 +01:00
Shane Kilkelly
0ce514a5a6 Add features to the user object in ide. 2016-03-31 17:10:49 +01:00
Henry Oswald
5a201153c7 refactored subscription updater again adding _setUsersMinimumFeatures
single place you can call and the users minimum features are set
2016-03-31 16:58:16 +01:00
Henry Oswald
cb3eb88af2 Merge branch 'subscriptionimprovements' 2016-03-31 11:58:56 +01:00
Henry Oswald
db8fb63bb5 fixed change payment details page
also increased size of year field for firefox users
and removed unnded options in new plan page
2016-03-31 11:54:52 +01:00
Shane Kilkelly
059d3432c2 Allow citations like -parencite[page 6]{ to work. 2016-03-30 11:28:56 +01:00
Henry Oswald
c7da9f1eef added different check to contact-us modal 2016-03-29 14:25:59 +01:00
Henry Oswald
1a651b38f4 added sendgrid as email option 2016-03-29 14:15:33 +01:00
Henry Oswald
e2dffdf722 when user contact us put project url at bottom of message 2016-03-24 14:23:18 +00:00
Henry Oswald
e9478e0843 Merge branch 'templatessearch' 2016-03-24 12:06:41 +00:00
Henry Oswald
6662d4c2cd wired up modal for learn and added translations 2016-03-24 12:05:54 +00:00
James Allen
63c183402c Style active and focus states of search results too 2016-03-24 11:42:48 +00:00
James Allen
9b84e1b164 Improve styling of wiki search 2016-03-24 11:38:56 +00:00
Henry Oswald
ce2cfeaa5b don't show search bar in templates if its not configured 2016-03-24 09:52:19 +00:00
Henry Oswald
6a4e13d3c8 added templates angular file forgoten in last commit 2016-03-24 09:35:11 +00:00
Henry Oswald
7634fcf3af added missing page button (not wired up) to /learn 2016-03-23 18:23:09 +00:00
Henry Oswald
90092a0c61 improved styling, not perefect still 2016-03-23 16:05:38 +00:00
James Allen
3fe0674462 Revert "Add error handling in mkdir_p"
This reverts commit c2458cd19018fe05199ce3b33fd4e9230d1cf319.

Apparently mkdirp needs errors to be ignored to work...
2016-03-23 15:33:01 +00:00
James Allen
4d0fe3bf5d Add error handling in mkdir_p 2016-03-23 15:18:10 +00:00
James Allen
ae5467894b Standardise on one Errors file 2016-03-23 15:14:49 +00:00
James Allen
a95c941cb9 Fix FileStore unit tests 2016-03-23 15:13:32 +00:00
James Allen
bad9a0282d Add missing error handler 2016-03-23 14:38:11 +00:00
James Allen
c827407a99 Merge branch 'master' of github.com:sharelatex/web-sharelatex 2016-03-23 11:29:59 +00:00
James Allen
3d8ac9f292 Add in a few null checks
These were discovered by using a project that was messed up with the moving
folder bug where the folder ended up without an id, docs or fileRefs array
2016-03-23 10:54:36 +00:00
Henry Oswald
de0aa1035d pulled tempaltes search into its own file 2016-03-22 22:29:18 +00:00
Henry Oswald
9cfbbfa504 template search works nicely, needs styling 2016-03-22 22:16:38 +00:00
Henry Oswald
cf45b8bd74 Merge branch 'master' into templatessearch 2016-03-22 21:35:36 +00:00
Henry Oswald
c554b0630d if user has subscription before joining group is given option to cancel personal one 2016-03-22 16:59:47 +00:00
Shane Kilkelly
62ececeef8 show logs on failure. 2016-03-22 16:59:40 +00:00
Henry Oswald
a6859e22b3 if user is member of group on downgrade use the group subscription 2016-03-22 16:05:46 +00:00
Shane Kilkelly
2c321a4803 If the compile request errors out, set view to 'errors'. 2016-03-22 15:51:05 +00:00
Shane Kilkelly
b212f33505 Merge branch 'master' of github.com:sharelatex/web-sharelatex 2016-03-22 15:21:00 +00:00
James Allen
9706585d21 Fix translate in delete modal confirm button 2016-03-22 14:44:13 +00:00
Shane Kilkelly
12b0e982c8 Don't raise an error if output.blg cannot be found. 2016-03-22 14:42:00 +00:00
Shane Kilkelly
d566ce3fd2 Merge branch 'master' of github.com:sharelatex/web-sharelatex 2016-03-22 14:38:56 +00:00
Shane Kilkelly
d5c280dc4d Show the pdf if it was already loaded.
This ensures the pdf will be visible if the user switches to fullscreen-view.
2016-03-22 14:38:48 +00:00
Henry Oswald
a89edde139 subscription tests fixed 2016-03-22 14:27:05 +00:00
Henry Oswald
cc84aaf834 Merge branch 'master' of https://github.com/sharelatex/web-sharelatex 2016-03-22 14:19:54 +00:00
Henry Oswald
7fb0249b2b null check subscription for custom accounts page 2016-03-22 14:19:46 +00:00
James Allen
a597ebfd90 Only show deleted files in track changes view 2016-03-22 14:13:50 +00:00
Henry Oswald
fbfd160c6d default message to empty string 2016-03-22 14:02:15 +00:00
Shane Kilkelly
b8c3b427ee Merge branch 'sk-pdf-error-display' 2016-03-22 14:00:12 +00:00
Shane Kilkelly
2dd9aa9424 Merge branch 'sk-environment-autocomplete' 2016-03-22 13:55:41 +00:00
Henry Oswald
cacb3bf39e Merge branch 'master' of https://github.com/sharelatex/web-sharelatex 2016-03-22 12:30:52 +00:00
Henry Oswald
69a7a1508b modal != modal instance 2016-03-22 12:28:37 +00:00
James Allen
7637c858c8 Merge branch 'master' of github.com:sharelatex/web-sharelatex 2016-03-22 12:14:18 +00:00
James Allen
4595c90363 Use translations for action in project delete modal 2016-03-22 12:12:11 +00:00