Shane Kilkelly
|
fbf5d35fa5
|
Merge branch 'master' into sk-tpr
|
2016-04-15 09:46:16 +01:00 |
|
Shane Kilkelly
|
9d027b88ba
|
Bug fix: re-introduce the project-too-large error message
|
2016-04-15 09:45:48 +01:00 |
|
Henry Oswald
|
ffa04c7b55
|
add project url onto query string for compile hashing
|
2016-04-13 15:38:04 +01:00 |
|
Shane Kilkelly
|
939d7cd042
|
Merge branch 'master' into sk-tpr
|
2016-04-11 16:41:34 +01:00 |
|
Shane Kilkelly
|
749d2aa013
|
Merge branch 'sk-safari-freeze-fix'
|
2016-04-11 14:47:03 +01:00 |
|
Shane Kilkelly
|
76697599ae
|
Use the _ide version of browserIsSafari
|
2016-04-11 14:45:26 +01:00 |
|
Shane Kilkelly
|
e3b2ec9977
|
Add a ide.browserIsSafari boolean flag.
|
2016-04-11 14:35:59 +01:00 |
|
Shane Kilkelly
|
8d6003dcc5
|
Add commentary
|
2016-04-11 09:58:37 +01:00 |
|
Shane Kilkelly
|
4fd4a0372c
|
In Safari, limit iterations of the command-parsing loop.
|
2016-04-11 09:55:53 +01:00 |
|
Henry Oswald
|
010bb61baf
|
add michael pic
|
2016-04-11 08:26:06 +01:00 |
|
Henrique Dias
|
ae79ce75b7
|
Update settings.defaults.coffee
|
2016-04-06 11:32:08 -03:00 |
|
Henrique Dias
|
38c8eb868a
|
Update package.json
|
2016-04-06 11:30:26 -03:00 |
|
Henry Oswald
|
424e09ec05
|
getGroupSubscriptionMemberOf gets plan code
|
2016-04-05 16:03:46 +01:00 |
|
Henry Oswald
|
bd54218cc9
|
added grunt as depenency
|
2016-04-05 14:17:36 +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 |
|
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 |
|
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
|
723031f7f3
|
un-show logs on successful run.
|
2016-03-22 10:32:55 +00:00 |
|
Shane Kilkelly
|
293cb3c73e
|
fix typo
|
2016-03-22 10:32:44 +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 |
|
James Allen
|
88b8ce1f80
|
Enable working settings acceptance tests
|
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 |
|
Shane Kilkelly
|
35b5d3cc05
|
Update ReferencesHandlerTests.
|
2016-03-18 11:43:39 +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 |
|
Shane Kilkelly
|
11d77df898
|
Fix weird tab behaviour
|
2016-03-17 16:18:46 +00:00 |
|
Shane Kilkelly
|
020fd2e88d
|
De-dupe autocomplete entries
|
2016-03-17 15:58:57 +00:00 |
|