Shane Kilkelly
|
939d7cd042
|
Merge branch 'master' into sk-tpr
|
2016-04-11 16:41:34 +01:00 |
|
Henry Oswald
|
424e09ec05
|
getGroupSubscriptionMemberOf gets plan code
|
2016-04-05 16:03:46 +01:00 |
|
Damien
|
77eba3ea22
|
Correct alignment for word count dialog
on less than `md` sized screen
|
2016-04-04 23:47:40 +02:00 |
|
Henry Oswald
|
633839c98b
|
for support tickets include browser/os and hide email address if
set already. This way we know who they are logged in with which has
caused condfusion.
|
2016-04-04 16:05:42 +01:00 |
|
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 |
|
Henry Oswald
|
1a651b38f4
|
added sendgrid as email option
|
2016-03-29 14:15:33 +01: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
|
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
|
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
|
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
|
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 |
|
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
|
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
|
d566ce3fd2
|
Merge branch 'master' of github.com:sharelatex/web-sharelatex
|
2016-03-22 14:38:56 +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 |
|
Shane Kilkelly
|
b8c3b427ee
|
Merge branch 'sk-pdf-error-display'
|
2016-03-22 14:00:12 +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 |
|
James Allen
|
aa1f2cc8a9
|
Remove #s in href on project list buttons
|
2016-03-22 12:11:59 +00:00 |
|
Henry Oswald
|
c777f498ad
|
Merge branch 'groove2'
|
2016-03-22 11:58:04 +00:00 |
|
James Allen
|
49bb4f07ea
|
Move delete docs into view in file-tree element
|
2016-03-22 11:15:52 +00:00 |
|
Shane Kilkelly
|
45077cfba9
|
Merge branch 'master' into sk-pdf-error-display
|
2016-03-22 10:56:59 +00:00 |
|
Shane Kilkelly
|
4f3755318f
|
Clean up.
|
2016-03-22 10:24:58 +00:00 |
|
James Allen
|
f182fbf396
|
Convert 'anonymous-user' from real-time api in 'null' internally
|
2016-03-22 09:53:47 +00:00 |
|
Shane Kilkelly
|
59b131f251
|
First pass at refactoring the output panel views.
|
2016-03-22 09:39:33 +00:00 |
|
James Allen
|
2af2dd694e
|
Use null to represent anonymous user, as AuthorizationManager expects
|
2016-03-22 09:39:25 +00:00 |
|
James Allen
|
7791805949
|
Allow admin access to projects
|
2016-03-21 17:03:41 +00:00 |
|
Henry Oswald
|
840d3b75bb
|
listen for close not exit when working with unzip command
sometimes the command will fail because stout has not finished yet
|
2016-03-21 16:37:29 +00:00 |
|
Henry Oswald
|
4d7ed1cb17
|
improved logging from unzip command
|
2016-03-21 16:00:12 +00:00 |
|
Shane Kilkelly
|
f58f1c3795
|
Account for the new too-recently-compiled error.
|
2016-03-21 15:16:17 +00:00 |
|
Shane Kilkelly
|
53dfa841cc
|
Add the beginnings of a clsi-maintenance-mode message
|
2016-03-21 15:00:25 +00:00 |
|
Shane Kilkelly
|
3b35605edc
|
Show logs, even if the compile timed out.
|
2016-03-21 14:05:26 +00:00 |
|
James Allen
|
9a0ec9c292
|
Don't throw fatal error when recently compiled
|
2016-03-21 13:54:45 +00:00 |
|
James Allen
|
8bfc613bb3
|
Log client side errors as warns so they don't show in Sentry
|
2016-03-21 13:29:34 +00:00 |
|
James Allen
|
6beb29f449
|
Don't treat no root resource as a fatal error
|
2016-03-21 13:28:53 +00:00 |
|
James Allen
|
8fb3e629e8
|
Require logins for all uploads to projects
|
2016-03-21 13:23:14 +00:00 |
|
Shane Kilkelly
|
9b22efbd98
|
split errors into normal error, and renderingError.
|
2016-03-21 13:20:03 +00:00 |
|
James Allen
|
0ba70e7ccc
|
Remove missing parameter in log lines
|
2016-03-21 13:15:57 +00:00 |
|
James Allen
|
2a9e451876
|
Refine error page to in all situations, and don't send sentry errors on not found errors
|
2016-03-21 11:55:59 +00:00 |
|
Henry Oswald
|
4e78e34cdf
|
finished contact us with groove
for settings file:
<a ng-controller="ContactModal", ng-click="contactUsModal()", href>Contact</a>
|
2016-03-21 11:41:05 +00:00 |
|
Shane Kilkelly
|
a704289099
|
Show the error view, even when the pdf is in an error state.
|
2016-03-21 10:26:39 +00:00 |
|
James Allen
|
e7d67668e9
|
Improve error reporting and show 404 when project ids are malformed
|
2016-03-18 15:59:12 +00:00 |
|
Henry Oswald
|
882297c353
|
working framework. not happy with groove. Can't set mailbox
|
2016-03-18 12:55:35 +00:00 |
|
Henry Oswald
|
209c8ebbfc
|
wip
|
2016-03-18 11:31:50 +00:00 |
|
Shane Kilkelly
|
f3db114654
|
Use the mongojs based apis to get Project and User information.
|
2016-03-18 11:20:33 +00:00 |
|
James Allen
|
de02928454
|
Merge branch 'master' into ja_email_tokens
|
2016-03-17 17:01:26 +00:00 |
|
Henry Oswald
|
c980382196
|
make calls to learn wiki run in parallel,
only saves about 150ms but ever little helps
|
2016-03-17 12:55:28 +00:00 |
|
James Allen
|
60a39f82c1
|
Fix off by one bug in moving folders from using an out of date project structure
|
2016-03-15 15:14:54 +00:00 |
|
James Allen
|
75d9912449
|
Use _.defaults to simplify assigning default features
|
2016-03-15 14:44:06 +00:00 |
|
James Allen
|
b7d226f434
|
Make privilege level check in EditorHttpController more explicit
|
2016-03-15 14:39:27 +00:00 |
|
James Allen
|
261466b042
|
Convert privilege levels to an enum
|
2016-03-15 14:35:01 +00:00 |
|
James Allen
|
398d43e2d1
|
Add missing ? check
|
2016-03-15 14:15:25 +00:00 |
|
James Allen
|
fe1f71413e
|
Use ProjectGetter, not Project, in ProjectController.loadEditor
|
2016-03-15 14:12:43 +00:00 |
|
James Allen
|
d09705142e
|
Add in missing error checks
|
2016-03-15 14:07:34 +00:00 |
|
James Allen
|
5781894453
|
Do array null check in callback args
|
2016-03-15 14:05:59 +00:00 |
|
Henry Oswald
|
76b3a78988
|
added lock around move element
|
2016-03-15 12:29:41 +00:00 |
|
Henry Oswald
|
d07e084446
|
Merge branch 'master' of https://github.com/sharelatex/web-sharelatex
|
2016-03-15 11:34:46 +00:00 |
|
Henry Oswald
|
ba9bc3a2e8
|
check that element being inserted has an _id
|
2016-03-15 11:29:59 +00:00 |
|
James Allen
|
b556d57f40
|
Remove missed console.log debugging lines in AuthenticationController.coffee
|
2016-03-14 17:11:23 +00:00 |
|
James Allen
|
71ef045728
|
Implement authorization guards in Authorization{Manager,Controller}
|
2016-03-14 17:06:57 +00:00 |
|
Shane Kilkelly
|
2d4ced6a1c
|
If user is not project owner, ask them to ask the owner to upgrade.
|
2016-03-14 16:19:08 +00:00 |
|
Henry Oswald
|
f24bc2c501
|
log out error when can't send to tpds worker
|
2016-03-14 14:44:45 +00:00 |
|
Henry Oswald
|
1b39b01114
|
check err on _putElement for file in project
|
2016-03-14 14:42:13 +00:00 |
|
Henry Oswald
|
8be55f760f
|
swallow error if tpdsworker can not be comunicated with on addFile
|
2016-03-14 10:49:28 +00:00 |
|
Henry Oswald
|
3fc357a343
|
Merge branch 'master' into projectsizelimit
|
2016-03-14 10:31:07 +00:00 |
|
Henry Oswald
|
086875d50c
|
added logging
|
2016-03-14 10:08:47 +00:00 |
|
Henry Oswald
|
15c6e49d1a
|
if user changes email then check if they have a site licence
|
2016-03-13 22:31:14 +00:00 |
|
Henry Oswald
|
8812ff445e
|
change zip size check to spawn
|
2016-03-12 15:43:16 +00:00 |
|
Henry Oswald
|
f11ba97389
|
check stat.isFile and isDirectory rather then symlink
|
2016-03-12 15:05:29 +00:00 |
|
Henry Oswald
|
6664b67fba
|
check size of zip files
|
2016-03-12 12:38:21 +00:00 |
|
Henry Oswald
|
da242d90e6
|
added extra isSymLink checks into reading files
|
2016-03-12 12:01:36 +00:00 |
|
Henry Oswald
|
7e216391b7
|
wip
|
2016-03-12 10:55:17 +00:00 |
|
James Allen
|
1bd8b8d1a3
|
Delete SecurityManager and replace with (unwritten) AuthorizationManager
|
2016-03-10 17:17:26 +00:00 |
|
James Allen
|
3e03164ed4
|
Remove dead auth_token code
|
2016-03-10 17:15:14 +00:00 |
|
Henry Oswald
|
36966f0c9b
|
wip
|
2016-03-10 17:11:28 +00:00 |
|
Henry Oswald
|
347bfe4a79
|
use cb for internal callbacks
|
2016-03-10 12:43:36 +00:00 |
|
Henry Oswald
|
3c4e74af4b
|
project duplicator works and tests pass.
not so bad now.
|
2016-03-10 12:42:21 +00:00 |
|
Henry Oswald
|
d801ab623a
|
project duplicator works, tests don't
|
2016-03-10 11:58:05 +00:00 |
|