github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-07 20:31:06 -05:00
Code Issues Projects Releases Packages Wiki Activity
4177 commits 3 branches 7 tags 201 MiB
Commit graph

1359 commits

Author SHA1 Message Date
Shane Kilkelly
d566ce3fd2 Merge branch 'master' of github.com:sharelatex/web-sharelatex 2016-03-22 14:38:56 +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
Shane Kilkelly
59b131f251 First pass at refactoring the output panel views. 2016-03-22 09:39:33 +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
Shane Kilkelly
9b22efbd98 split errors into normal error, and renderingError. 2016-03-21 13:20:03 +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
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
3fc357a343 Merge branch 'master' into projectsizelimit 2016-03-14 10:31:07 +00:00
Henry Oswald
7e216391b7 wip 2016-03-12 10:55:17 +00:00
Henry Oswald
36966f0c9b wip 2016-03-10 17:11:28 +00:00
Henry Oswald
3643f6ef4f Merge branch 'master' of https://github.com/sharelatex/web-sharelatex 2016-03-08 14:13:40 +00:00
Brian Gough
d89e855314 add client-side spelling cache to reduce load on server 2016-03-03 16:00:10 +00:00
Henry Oswald
8a4a320f4b done -> close on modal for sharing 2016-03-01 20:17:15 +00:00
Henry Oswald
8f0d1dc73e add in the calls to block large projects 2016-02-29 13:05:17 +00:00
James Allen
71ca358e0e Show confirmation if upload will overwrite files 2016-02-24 16:37:03 +00:00
James Allen
2c20b7d16f Bring full screen PDF icon into scrollable div 2016-02-23 15:25:04 +00:00
James Allen
ff7632d6c7 Don't reload editor with file tree or PDF viewer hidden 2016-02-23 15:21:54 +00:00
Henry Oswald
85a8bc97ed add leave group button for group subscriptions 2016-02-19 12:27:32 +00:00
James Allen
bf36413491 Improve styling of upgrade messages 2016-02-18 14:53:49 +00:00
Henry Oswald
8a417035ea remove unned debug line 2016-02-17 16:23:52 +00:00
James Allen
e4960e782f Merge branch 'ja-multi-select' 2016-02-12 11:56:10 +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
5c5888b5dc Merge branch 'pr/221' 2016-02-11 11:44:45 +00:00
James Allen
506d2224aa Allow Cmd+Clicking to multi select entries in the file tree 2016-02-09 15:13:58 +00:00
James Allen
a6793be3cf Improve presentation of hotkeys and add bold+italics 2016-02-04 15:52:38 +00:00
Henry Oswald
f136486f4b cleanup layout of notifications 2016-02-04 14:28:31 +00:00
James Allen
8a095a5144 Upgrade to PDF 1.3.91 2016-02-04 14:27:00 +00:00
Henry Oswald
9d61a58710 slighly change layout of notifications & insert html via angular 2016-02-04 12:11:45 +00:00
Henry Oswald
8af9aa6396 move wufoo form on plans page to groovehq 2016-02-03 16:50:34 +00:00
James Allen
4c626f23e7 Merge pull request #224 from sharelatex/ja_draft_mode 
Draft mode for compiles
 2016-02-02 15:04:21 +00:00
James Allen
425a9b9db2 Add in option to compile in draft mode 2016-02-02 14:50:48 +00:00
Henry Oswald
1f6b43e1b1 added universties site angular controler 2016-02-01 14:33:50 +00:00
James Allen
3d9f326219 Update translation strings for tags 2016-02-01 10:18:57 +00:00
James Allen
b32178182d Explicitly create tags and get their id 2016-02-01 10:18:56 +00:00
James Allen
1bd5aef85f Allow renaming of tags 2016-02-01 10:18:56 +00:00
James Allen
1a86e69d1f Allow tags to be deleted 2016-02-01 10:18:56 +00:00
Henrique Santos
9429e49cf8 finishing frontend 2016-01-22 18:08:39 -02:00
Henrique Santos
476eaa8b84 add notification backend and unit test 
add notification init frontend
 2016-01-21 18:42:50 -02:00
James Allen
38876a9d4c Don't show publish buttons when showing free trial for templates 2016-01-19 16:10:50 +00:00
James Allen
5125aa0089 Make templates a premium feature 2016-01-19 13:37:22 +00:00
Henry Oswald
d202538504 added ng-cloak to successful subscription page 2016-01-04 12:22:31 +00:00
Henry Oswald
5f66dbebf4 2015 -> 2016 2016-01-04 11:12:10 +00:00
Henry Oswald
134e733b01 change succesful subscription message 2015-12-21 10:31:22 +00:00
Henry Oswald
1ad27bb6ed changed left menu test to show random benefit to users 2015-12-16 12:40:34 +00:00
James Allen
c0dfdb3bd8 Use translations for activation page 2015-12-11 14:25:17 +00:00
James Allen
c40b882ee2 Merge branch 'master' of github.com:sharelatex/web-sharelatex 2015-12-11 11:30:20 +00:00
James Allen
1e8ab5357b Improve pre-registered account activation process 2015-12-11 11:30:06 +00:00
Brian Gough
ba6c361afa decrease sentry sample rate to 1% 2015-12-10 14:18:20 +00:00
Henry Oswald
297e33f1a0 remove unneeded hide on cancelation basic 2015-12-09 14:44:26 +00:00
Henry Oswald
d5cf8f6886 simplified cancelation logic 2015-12-09 13:58:26 +00:00
Henry Oswald
7a88afc953 make button for downgrade centered and lower 2015-12-09 12:09:17 +00:00
Henry Oswald
bdc2206ef1 yes_please != yes_please! 2015-12-09 12:03:18 +00:00
Henry Oswald
db8349351d escape html in cancel message 2015-12-09 12:01:55 +00:00
Henry Oswald
e6f92c181f ill_take_it != ill_take_it! 2015-12-09 12:00:31 +00:00
Henry Oswald
56fa51f9b2 got translations done for subscription dashboard 2015-12-09 11:24:14 +00:00
Henry Oswald
aafdeb031e wip - downgrade options it all works, need unit tests & translations 2015-12-08 18:23:28 +00:00
Henry Oswald
8fb1f9e00b wip: downgrade to student if they are a collab monthly 2015-12-08 15:45:52 +00:00
Henry Oswald
5c05d02840 Merge branch 'master' of https://github.com/sharelatex/web-sharelatex 2015-12-08 11:38:29 +00:00
Henry Oswald
fc7ca5ef74 tried changing a couple of sentry ignore to regex's 2015-12-08 11:38:21 +00:00
Brian Gough
cd4ab35fbc only send a 5% sample of sentry errors 2015-12-08 11:34:11 +00:00
Henry Oswald
7e31851949 fix margin for modal alerts on upload 2015-12-08 08:50:11 +00:00
Henry Oswald
88799fc881 add help link when user needs to refresh page 2015-12-04 08:43:55 +00:00
Henry Oswald
25411189a7 redirect to login if session expired in file upload 2015-12-02 15:40:14 +00:00
Henry Oswald
6738fdd1fc added translation for rate limit message to client 2015-12-01 13:11:19 +00:00
Henry Oswald
8590af3e49 added rate limit on server side for file uploads 2015-12-01 13:08:49 +00:00
Henry Oswald
a6aea41fb1 added max of 20 files which can be uploaded at same time to client 2015-12-01 12:55:35 +00:00
Henry Oswald
4fa38178be ignore some common errors in sentry 2015-11-30 13:49:46 +00:00
Henry Oswald
8ca962b734 added missing convert handler 2015-11-24 14:17:40 +00:00
Henry Oswald
89b2cd8477 added secure banner to both payment forms 2015-11-23 17:10:53 +00:00
Henry Oswald
333c1be68f added dropbox and github promo on left hand side 2015-11-23 15:12:17 +00:00
Henry Oswald
003cdc01fc consolidated 2 options in payment left menu 2015-11-18 15:21:48 +00:00
Henry Oswald
5a9174b1de use user_id for client side six pack. also change name of editor free trial test 2015-11-17 15:54:59 +00:00
Henry Oswald
b1c0dfb0e4 show discount rate on pricing page 2015-11-17 12:23:27 +00:00
Henry Oswald
264839e27d don't show tax or subtotal if there is no info on it 2015-11-17 11:44:31 +00:00
Henry Oswald
d959a51f36 show normal price if there is a discount 2015-11-17 11:42:03 +00:00
Henry Oswald
471b285ad7 changed plan choice using ab sixpack not ga 2015-11-16 16:40:14 +00:00
Henry Oswald
f7854649e2 added 20% off option 2015-11-16 15:58:04 +00:00
Henry Oswald
05c45cd658 changed upgrade to list features 2015-11-16 14:36:59 +00:00
Henry Oswald
3ef18a09eb removed finished sixpack test 2015-11-16 12:21:24 +00:00
Henry Oswald
8a6c3b5838 covert payment-left-menu test 2015-11-12 09:57:06 +00:00
Henry Oswald
3a61f48068 added payment page with security seal 2015-11-11 17:59:35 +00:00
Henry Oswald
e4b36e6c5c moved where ask_proj_owner_to_upgrade_for_history shows up in rendering issue 2015-11-11 17:25:28 +00:00
Henry Oswald
cf6998cac3 added ab test into payment page left hand feature list 2015-11-11 16:42:04 +00:00
Henry Oswald
453415ff7c fixed tab index on payments page 2015-11-11 16:22:07 +00:00
Henry Oswald
da9535f442 fix an alignment issue 2015-11-10 15:38:05 +00:00
Henry Oswald
b6b252b1f8 only participate in track changes test if they are shown view 2015-11-10 15:14:27 +00:00
Henry Oswald
615e4b448a fix search on project list page. ng-if breaks it but ng-show does not for some reason 2015-11-10 11:36:11 +00:00
Henry Oswald
c8ba7b72ab Merge branch 'master' of https://github.com/sharelatex/web-sharelatex 2015-11-10 10:36:06 +00:00
James Allen
a153c6682a Put in client side check for document getting too long 2015-11-06 12:51:43 +00:00
James Allen
16b7bf222a Merge branch 'contacts' 2015-11-05 10:14:25 +00:00
James Allen
21f702a42e Fix bug with click on share button registering 2015-11-04 14:33:27 +00:00
Henry Oswald
77d349dd8f added more long form list of features on track changes upgrade 2015-11-02 18:44:26 +00:00
Henry Oswald
0ef8d77ce3 project list minimal to work with projects 2015-11-02 18:44:12 +00:00
Henry Oswald
79c4c6e26b added split test for on boarding, doing cut down view 2015-11-02 16:15:56 +00:00
Henry Oswald
730088b6ab set button colour to red for free trial 2015-10-27 23:35:13 +00:00
Henry Oswald
2d03410c42 removed some editor actions sent to google analytics as we are sending too much data 2015-10-27 23:28:54 +00:00
Henry Oswald
6c75a6dbe5 change six pack key and add into default settings 2015-10-27 11:37:11 +00:00
Henry Oswald
b9187ebd08 added test to wording for datajoy popup 2015-10-27 10:58:51 +00:00
Henry Oswald
8f1d09beea added six pack to web 2015-10-27 10:58:27 +00:00
James Allen
bafd3a1cb4 Merge branch 'master' of github.com:sharelatex/web-sharelatex 2015-10-16 12:31:21 +01:00
James Allen
144f1396b7 Fix problem with pasting multiple emails 2015-10-15 17:03:22 +01:00
James Allen
fb42489803 Improve formatting of users, groups and tags 2015-10-15 16:43:53 +01:00
Henry Oswald
2f48568f76 fix free trial button on timeout view 2015-10-15 11:38:01 +01:00
James Allen
d996ed6e47 Refactor addUserToProject for better access by groups 2015-10-14 17:29:58 +01:00
Henry Oswald
a1f57f220b inline ng-clock as it does not work for firefox in base.less quickly enough 2015-10-14 16:22:32 +01:00
Henry Oswald
f5162d424f if a user is inactive for 12 hours disconect them. 2015-10-14 14:28:24 +01:00
James Allen
c4e4f2c77a Add modules hook for contacts and support groups in auto complete 2015-10-08 18:17:53 +01:00
James Allen
8cc7869b03 Pull in contacts from contacts api and send to tag-input for autocomplete 2015-10-07 17:32:35 +01:00
Henry Oswald
a73b2ceb37 Merge branch 'connect-failed' 2015-10-07 11:30:48 +01:00
James Allen
64ffcde3df Namespace subscription groups as SubscriptionGroup 2015-10-05 16:37:03 +01:00
Shane Kilkelly
15847f8921 Add the 'release' attribute to Sentry configuration. 2015-09-29 15:41:25 +01:00
Shane Kilkelly
b4c7209a11 Try to reconnect either on editor-cursor move, or when any thing in the page is clicked. 2015-09-29 10:23:21 +01:00
Shane Kilkelly
30a63d1e42 Remove ng-click on output files, which was causing a double-request for download. 2015-09-22 10:11:03 +01:00
Henry Oswald
24007affa7 change admin link to /admin/user 
this is the page for the admin panel, if the panel is installed
then it will load, otherwise a redirect to register users has been
added in.
 2015-09-16 12:17:58 +01:00
Henry Oswald
5ffd76c670 Merge branch 'master' of https://github.com/sharelatex/web-sharelatex 2015-09-14 15:36:08 +01:00
Henry Oswald
9a72667e91 added word count UI feature. 2015-09-14 15:28:19 +01:00
Shane Kilkelly
5e157bcd16 Fix a case where a null user would cause displayName to crash. 2015-09-14 12:27:27 +01:00
Shane Kilkelly
7bc9218b3c Fix up a bunch of issues with the track-changes list view. 
- not crash when a user is null
- fix alignment of user color square
- if first and last name are absent, display email instead
- truncate overly long display name with '...'
 2015-09-14 12:08:05 +01:00
Shane Kilkelly
778f588741 Merge pull request #199 from sharelatex/sk-missing-users 
When a user is null in track-changes UI, display them as "Anonymous".
 2015-09-11 14:24:08 +01:00
James Allen
662050b3f9 Only show services header if we have some services to render 2015-09-10 16:01:12 +01:00
Shane Kilkelly
4a315a0474 When a user is null in track-changes UI, display them as "Anonymous". 2015-09-10 14:35:09 +01:00
James Allen
5fdb50958e Fix logs dropdown to work with Angular 1.3 2015-09-03 13:13:28 +01:00
James Allen
95db287fef Fix more dropdown menu in project list for new Angular 2015-09-03 13:02:43 +01:00
James Allen
c64891a61b Fix folder dropdown to work with new Angular 2015-09-03 12:54:11 +01:00
James Allen
aa06eb55b7 Merge branch 'master' into angular_1.3.15 2015-09-03 12:52:08 +01:00
James Allen
7446572ed9 Group online users into dropdown menu when more than 3 2015-09-02 14:33:51 +01:00
James Allen
34c8f22dd7 Allow multiple collaborators to be added at once with a list of emails 2015-09-02 14:33:43 +01:00
James Allen
ec5e03bd01 Fix subscription currency dropdowns 2015-08-04 15:58:31 +01:00
Henry Oswald
53dc0b63c8 v1 of enago 2015-08-04 10:45:19 +01:00
Henry Oswald
3e55aef25a show error if socket io fails to connect. Not tested yet. 2015-07-31 15:42:47 +01:00
James Allen
30eb79dfdc Add link to DataJoy that shows randomly 50% of the time 2015-06-09 15:36:16 +01:00
James Allen
0eec715bb5 Upgrade to Angular 1.3.15 and latest ui-bootstrap 2015-06-09 14:59:12 +01:00
Henry Oswald
aaa902cca9 fixed bug with subscriptions where if an old user had a subscription and was in a group they would get a confusing page 2015-06-01 14:38:09 +01:00
Henry Oswald
33aa5c732f if a domain licence link has expired render a nice message explaining they need to retry 2015-06-01 12:43:42 +01:00
Henry Oswald
cb48242b74 changed email expire to 1 day for verifying account 2015-06-01 12:22:46 +01:00
Henry Oswald
d3f6c0c614 Merge branch 'user-csv' of git://github.com/heukirne/web-sharelatex into heukirne-user-csv 2015-05-29 12:17:54 +01:00
Henry Oswald
e4011b9ba1 Merge branch 'emailverification' 2015-05-29 12:10:02 +01:00
Henry Oswald
702fdc1480 improved views for domain licence invites 2015-05-29 12:09:28 +01:00
Henrique Dias
f50eb0398f add export csv group feature 2015-05-28 16:54:41 -03:00
Henry Oswald
e454d2f059 don't allow renaming in client if user is not owner 2015-05-28 12:59:02 +01:00
Henry Oswald
ca28d8ee70 changed views to use translations 2015-05-27 22:15:46 +01:00
Henry Oswald
b657c5207e cleaned up the views a bit 2015-05-27 21:45:29 +01:00
Henry Oswald
481bd67fbd changed paths to use hyphens and add succesfull join page 2015-05-26 15:26:45 +01:00
Henry Oswald
cad8d8a23b v1 basic invite works, not pretty or tested 2015-05-22 13:57:15 +01:00
Brian Gough
3ad517e1c2 Merge pull request #177 from sharelatex/fix-ace-extension-errors 
prevent loading error for ace language tools extension in development
 2015-05-05 14:47:44 +01:00
Brian Gough
6014085e8e prevent loading error for ace language tools extension in development 2015-05-05 14:33:18 +01:00
Henry Oswald
72af6748c9 Merge pull request #157 from oskanberg/patch-1 
Rename 'javscript' to 'javascript'
 2015-05-05 14:28:27 +01:00
Henry Oswald
9764ab258b added complex password validation to password resets 2015-04-30 12:05:46 +01:00
Henry Oswald
635f79d2f6 added password strength check to change password 2015-04-28 18:30:19 +01:00
Henry Oswald
f385a7a4b5 open chat links in new window 2015-04-28 16:20:24 +01:00
Henry Oswald
31a51b73d8 improved linkify so data is correctly sanitized, used inbuilt angular lib 
don't know how I missed that last time!
 2015-04-22 17:58:33 +01:00
James Allen
af85c83877 Buffer updates when only a single user is editing a document 
Add in 5 second delay between flushing updates when only a single user
is editing a document. As soon as an update is received from another user
we switch to sending updates immediately again so there is no latency
between collaborators. The logic applies to individual docs, so two users
can be editing different docs and will still buffer updates since they
will not affect each other.
 2015-04-17 11:24:28 +01:00
Brian Gough
0684fa36fd upgrade pdfjs to version 1.0.1040 2015-03-31 14:53:27 +01:00
James Allen
8483f249ee Actually proxy websocket connections 2015-03-20 19:08:48 +00:00
Brian Gough
b0a32b1ef8 make new pdf viewer the default for all users 
remove old pdf viewer
 2015-03-20 11:28:28 +00:00
James Allen
ff55e4c5ed Merge branch 'private_registration' 2015-03-20 10:34:17 +00:00
James Allen
9b8cf7bcfa Remove public registration and require that a user be registered by an admin 2015-03-19 14:22:48 +00:00
James Allen
d76ef86077 Tell user to contact admin email to register 2015-03-18 16:20:26 +00:00
Brian Gough
adb98d05b5 sentry 1.1.16 does not yet support release parameter, use build tag instead 2015-03-18 15:50:26 +00:00
Brian Gough
5d788ca7c5 add grunt version target to report version to sentry 
it writes the git commit id and Jenkins build number into the sentry
configuration
 2015-03-17 16:59:17 +00:00
Oliver Skånberg-Tippen
5df9f49a4e Rename 'javscript' to 'javascript' 2015-03-10 18:56:46 +00:00
James Allen
bb61dfe34a Show nice error page if socket.io could not be loaded 2015-03-09 13:57:13 +00:00
Henry Oswald
97f0fad525 add vat number option to payment form 2015-03-04 18:08:06 +00:00
Brian Gough
edc83b905c remove circular references when reporting to sentry 2015-03-03 16:41:21 +00:00
Henry Oswald
387a8b8ae3 hide some forms in user settings if authentication is managed by external system 2015-02-24 13:41:46 +00:00
Henry Oswald
5028665913 ignore errors from https://pstatic.datafastguru.info its malware we have 
no control over
 2015-02-23 17:29:38 +00:00
Henry Oswald
c33956c0af fix jade warnings about missing space, need to escape the module html 
insertions a different way. != func rather than !{func}
 2015-02-23 10:18:48 +00:00
Henry Oswald
e4121d8a28 forgot comma in ignoreUrls 2015-02-19 11:25:06 +00:00
Henry Oswald
ad5de0e93a added null check on Facebook 2015-02-18 22:25:58 +00:00
Henry Oswald
5d09999da5 ignore errors from twitter loading 2015-02-18 22:19:49 +00:00
Henry Oswald
455d78773e change the meta tags a little to help with so 2015-02-18 21:57:21 +00:00
James Allen
766bfbf5ef Provide easy way out of track-changes 2015-02-18 17:50:14 +00:00
Henry Oswald
216c9cefe3 don't error on subscription dashboard page if there is no subscription.taxRate 2015-02-12 09:21:45 +00:00
Henry Oswald
bf38fb7459 Merge branch 'master' of https://github.com/sharelatex/web-sharelatex 2015-02-10 18:05:51 +00:00
Henry Oswald
1d6c928c81 fix bug which showed all plans as monthly in payment form. 
Also use translations for string of month/year
 2015-02-10 18:05:39 +00:00
James Allen
b44e9b1dcb Move template front end code to module 2015-02-10 13:02:43 +00:00
James Allen
e4b77a2563 Merge branch 'dropbox-module' 2015-02-10 11:38:32 +00:00
James Allen
001a5d751b Pull out templates logic into its own module 2015-02-10 11:24:34 +00:00
Henry Oswald
08420a305a autolink chat messages 2015-02-07 16:15:33 +00:00
Henry Oswald
7918ea4bc3 don't evaulate wiki/learn html with angular 2015-02-07 15:55:27 +00:00
Henry Oswald
7030d5f822 change plan shows price including tax 2015-02-06 16:19:52 +00:00
James Allen
6c387edbe2 Remove Dropbox front end logic from main sharelatex repo 2015-02-05 18:20:34 +00:00
James Allen
f75376124e Update open source branding 2015-02-05 16:56:35 +00:00
James Allen
d7afb4e513 Clean up unused real-time code in web 2015-02-05 16:37:37 +00:00
James Allen
3aad31069c Always show chat name or email 2015-02-05 13:05:57 +00:00
James Allen
888ebd5d7b Attempt to stop superfish malware from loading 2015-02-05 11:23:45 +00:00
Henry Oswald
993c5bcee7 dont show generic error message on subscriptions if they are part of a group 2015-02-04 20:56:50 +00:00
James Allen
860de1528f Load default coupon code if provided in query string 2015-02-02 17:42:27 +00:00
James Allen
48a17729e4 Show change plan list on clicking change plan, not hide 2015-02-02 14:53:45 +00:00
Henry Oswald
cb889efb6a Merge branch 'master' of https://github.com/sharelatex/web-sharelatex 2015-01-29 18:32:26 +00:00
Henry Oswald
948eeb87ba improved momentjs 
- access it via amd not global
- remove warning message
- updated 2.7.0 -> 2.9.0
 2015-01-29 18:31:11 +00:00
Henry Oswald
5a15e826a7 moved mathjax to be served locally 2015-01-29 18:29:53 +00:00
James Allen
3731c62e17 Get validation working with address fields and Angular digest loop 2015-01-29 14:22:57 +00:00
James Allen
2a78a7843a Allow subscriptions with no free plans, and adjust styles 2015-01-29 14:11:25 +00:00
Henry Oswald
b06c9f509e if chat errors don't keep trying to get more chat messages 
causes loop which is why we have so many sentury errors
 2015-01-26 15:36:34 +00:00
Henry Oswald
90bb12db40 added state to payment form 2015-01-19 20:27:01 +00:00
Henry Oswald
208dfea5c8 pull right the total prices on the payment page 2015-01-19 15:35:05 +00:00
Henry Oswald
7508ba6c47 improved validation so that fields recurly said are wrong get highlighted 2015-01-07 16:43:20 +00:00
Henry Oswald
f6e9c544e6 slightly improved the breakdown form. Still not very pretty. 2015-01-07 14:59:56 +00:00
Henry Oswald
5d6a96ba4f made form thinner 2015-01-07 14:51:54 +00:00
Henry Oswald
f9843b3709 tax auto updates on change of address now. Is also preset based on users ip address 2015-01-07 13:16:19 +00:00
Henry Oswald
d678af4417 only validate credit card an cvv if there is data in them 2014-12-28 22:19:15 +00:00
Henry Oswald
735dd0811c changed credit card/paypal logs from offical ones to font very good ones 
upgraded fontamerican to 4.2
 2014-12-28 22:14:39 +00:00
Henry Oswald
1716b16fb0 added placeholder info to address 2014-12-28 22:03:12 +00:00
Henry Oswald
afab06bcac removed safe message from payment form. 2014-12-28 21:56:17 +00:00
Henry Oswald
1a4825a47b pulled total price down a little 2014-12-28 19:08:36 +00:00
Henry Oswald
0efb1bba5b adjusted post code and country field sizes 2014-12-28 19:06:01 +00:00
Henry Oswald
2d03e0532f adjusted style of payment options 2014-12-28 19:04:47 +00:00
Henry Oswald
40aeed74ce added little ssl secure message 2014-12-28 18:55:29 +00:00
Henry Oswald
bd52594f23 added new official paypal logo from https://www.paypal.com/uk/webapps/mpp/logo-center 2014-12-28 18:43:53 +00:00
Henry Oswald
673140b620 got new credit card logos from https://www.mastercardbrandcenter.com/us/getourbrand/index.shtml?pageId=dl_0340&expertVisible=false 2014-12-28 18:35:44 +00:00
Henry Oswald
9d57288809 centered the billing forms 2014-12-28 18:23:08 +00:00
Henry Oswald
236d4d7ab3 made the fields smaller and pushed plan name to header 2014-12-28 18:16:55 +00:00
Henry Oswald
137b9c1077 removed some labels and added paypal/credit card logos 2014-12-28 17:59:29 +00:00
Henry Oswald
baa0a42825 coupon field is shown if query string scf is shown 2014-12-28 17:51:36 +00:00
Henry Oswald
7f979e77db - fixed new payment page so it uses correct plan and currency 
- submit button is disabled while processing
- removed test data
 2014-12-28 17:16:21 +00:00
Henry Oswald
ecb71d5bbf pull recurely pub api key from settings file 2014-12-23 12:08:01 +00:00
Henry Oswald
12a28d91f2 removed month names 2014-12-23 12:00:41 +00:00
Henry Oswald
74347611e9 don't show the form until we have some data from recurly 2014-12-23 11:44:42 +00:00
Henry Oswald
03311311dd added translations in 2014-12-23 11:42:56 +00:00
Henry Oswald
e2819c3bc6 added generic error handling to recurly processing and required fields 2014-12-23 11:04:54 +00:00
Henry Oswald
d0c9783718 added paypal option in, not tested as we don't have paypal in stag 2014-12-22 15:51:50 +00:00
Henry Oswald
fb0a083b36 added address 2 2014-12-22 15:19:40 +00:00
Henry Oswald
6cedfb19d9 cleaned up form and added basic validation 2014-12-22 15:07:55 +00:00
Henry Oswald
fa1ec44e22 coupons work 2014-12-22 14:06:39 +00:00
Henry Oswald
a47b25d4b2 works with multi plan and currency, auto updates view on change 2014-12-22 12:55:29 +00:00
Henry Oswald
5305cbfd3e got more correct details making it to recurly and improved form. 2014-12-19 11:17:35 +00:00
Henry Oswald
cc545db17b can add account just about into recurly 2014-12-18 18:59:29 +00:00
Henry Oswald
47fb2a0878 basic angular form which has data bound to it 2014-12-18 17:48:23 +00:00
Brian Gough
505675803b increase sentry sample rate to 100% 2014-12-18 09:31:38 +00:00
Brian Gough
7429e7845d add sentry exclusion list and set logging sample rate to 1% 2014-12-16 11:34:48 +00:00
Brian Gough
419d84564c add support for client-side error logging using sentry 2014-12-12 13:58:07 +00:00
Brian Gough
265ad4439c Merge branch 'master' of github.com:sharelatex/web-sharelatex into pdfng 2014-12-05 14:43:01 +00:00
Brian Gough
b388c587e5 remove debugging log for pdf featureswitch 2014-12-04 16:42:28 +00:00
James Allen
4020c2f760 Update wrong synctex tooltip 2014-12-03 11:01:41 +00:00
James Allen
31ee8eea8b Show sync panel for everyone except anonymous users 2014-12-03 10:09:40 +00:00
Brian Gough
5053536fff load the compatibility library from the correct version of pdf.js 2014-12-01 15:41:17 +00:00
Brian Gough
25bebe1104 support old and new pdf viewers depending on feature switch 2014-12-01 14:35:12 +00:00
Brian Gough
3fd8bfb221 make the pdf viewer directive conditional depending on user feature switch 2014-12-01 11:47:56 +00:00
Brian Gough
175de30967 Merge branch 'master' into pdfng 2014-12-01 10:09:04 +00:00
Brian Gough
57b09e1d60 started making pdf viewer conditional - work in progress 2014-11-28 16:59:39 +00:00
James Allen
793763f206 Merge pull request #120 from watercrossing/POSTFix 
Declare forms to use method="POST" explicitly
 2014-11-28 11:11:18 +00:00
Henry Oswald
fa755c6521 added project to long check from clsi2 (bit of a punt) 2014-11-27 15:42:37 +00:00
Henry Oswald
02ef07dca4 broken free trial func into own file. added ab test on upgrade button colour 2014-11-24 23:59:55 +00:00
Henry Oswald
6c0f03e9c7 added ab test to show collar plan to people in editor 2014-11-24 16:21:03 +00:00
Ingolf Becker
9d71073a5c Added more POST declarations 2014-11-17 15:19:11 +00:00
Ingolf Becker
fd28751db0 Change Login and Register methods to use POST rather than GET 2014-11-17 14:55:28 +00:00
James Allen
e559c72491 Connect to configurable websocket service 2014-11-17 13:38:44 +00:00
Henry Oswald
804bc16bc8 redirect users to /register when coming from templates or share url 
redirect to /login when going anywhere else (/project /project/1234)
 2014-11-13 17:12:39 +00:00
Henry Oswald
efe8667e5e changed the top level on bonus 2014-11-13 15:23:13 +00:00
James Allen
a59a2dcf39 Make sure to send description before publishing 2014-11-07 10:20:29 +00:00
James Allen
c9e5583394 Use local versions of jquery and angular 2014-11-07 09:49:30 +00:00
James Allen
22f5c5dcb9 Keep spacing consistent 2014-11-03 14:25:53 +00:00
James Allen
1d6647e67d Add in github to plans page 2014-11-03 14:23:12 +00:00
Henry Oswald
fab0dc5cbc change button to a 2014-10-23 11:51:35 +01:00
Henry Oswald
b067e0d0a4 fixed email us button on templates 2014-10-23 11:18:04 +01:00
Henry Oswald
8097e6ad71 made 7 day free trial the default 2014-10-21 13:48:46 +01:00
Henry Oswald
36136a99ca fixed escaping of html 2014-10-20 15:46:42 +01:00
Henry Oswald
3cf64ce34f pass new compile features to client side, don't show timeout upgrade for premium users 2014-10-20 12:21:40 +01:00
Henry Oswald
fc4bc08fc2 added upgrade to get faster compiles message to timeout 2014-10-17 16:01:26 +01:00
Henry Oswald
750b050358 added ab test in for multi currency 2014-10-15 16:21:45 +01:00
Henry Oswald
e443809206 free trial length is show correctly at bottom of plans page 2014-10-15 11:49:20 +01:00
James Allen
fd8991f62e Sort out responsive flow 2014-10-15 10:23:08 +01:00
James Allen
64fe2a2404 Improve CSS and layout of feature list on new subscription page 2014-10-15 10:22:03 +01:00
James Allen
b32375530c Refactor card css for use in new subscription page 2014-10-14 15:46:44 +01:00
Henry Oswald
b2b13ef9a7 pass plan to payment page to get the number of collaborators 2014-10-14 12:14:24 +01:00
Henry Oswald
2538d16e63 Merge branch 'master' of https://github.com/sharelatex/web-sharelatex 2014-10-14 11:50:10 +01:00
Henry Oswald
3382c5bb17 added blurb to payment page 2014-10-13 17:51:59 +01:00
Henry Oswald
5a0d74753f plans page will auto redirect to best guess currency 2014-10-13 17:39:44 +01:00
Henry Oswald
52c54e7300 added ability to change currency on payment page 2014-10-13 17:28:00 +01:00
Henry Oswald
58f6ae323b fix which plan is "your plan" on dashboard 2014-10-13 16:33:01 +01:00
Henry Oswald
2bbdea3433 renamed change currency function and sorted out recommended currency 2014-10-13 16:27:27 +01:00
James Allen
cfb3969b88 Fix alignment in left menu 2014-10-13 14:45:45 +01:00
Henry Oswald
36264706f6 hooked the plans page up to the geo ip lookup 2014-10-13 14:10:15 +01:00
Henry Oswald
b90003b11e added custom user dashboard page 2014-10-10 15:44:53 +01:00
Henry Oswald
9924882b59 Merge branch 'master' of https://github.com/sharelatex/web-sharelatex 2014-10-09 16:45:26 +01:00
Henry Oswald
9803f8bd70 changed uni page holder and footer 2014-10-09 16:45:04 +01:00
Henry Oswald
c2c29bb282 university site renders via prozy ok 2014-10-08 16:07:44 +01:00
James Allen
8f7dff1518 Don't show empty sync menu list for collaborators 2014-10-08 15:57:56 +01:00
James Allen
3a9d8c2b31 Make Dropbox unlinking consistent with github 2014-10-08 14:02:37 +01:00
James Allen
128c672edd Merge branch 'github-sync' 
Conflicts:
	package.json
 2014-10-08 12:13:37 +01:00
James Allen
e406034ad6 Add in Dropbox description 2014-10-07 14:42:03 +01:00
James Allen
dbd85a05f1 Send user features and features switches to views where needed 2014-10-07 13:31:13 +01:00
James Allen
10732d112d Hook module system into project list page 2014-10-03 11:32:59 +01:00
Henry Oswald
b05c6bb001 fixed hiding lang popup in firefox 2014-10-02 17:27:02 +01:00
Henry Oswald
3442786930 fixed template error 2014-09-30 21:52:00 +01:00
Henry Oswald
de6135c777 added missing translations 2014-09-30 11:41:47 +01:00
Henry Oswald
9faf4771e7 added ab test controller so it is always loaded 2014-09-29 17:33:54 +01:00
Henry Oswald
a0174c649b added a couple of missing translations 2014-09-26 16:35:57 +01:00
Henry Oswald
ca4dc9bf00 added missing translation 2014-09-26 15:04:25 +01:00
Henry Oswald
21f46da08a changed ab test from 30 -> 14 to 14 -> 7 2014-09-26 10:56:45 +01:00
Henry Oswald
d5f816598d fixed incorrect message showed in pubic modal 2014-09-20 09:20:36 +01:00
Henry Oswald
583b333a73 change nexted level of templates ng-controller 2014-09-10 15:33:59 +01:00
Henry Oswald
bed78665f5 hide the currency dropdown for the moment 2014-09-10 08:17:22 +01:00
James Allen
e973a66482 Allow client side module code injection 2014-09-08 17:33:30 +01:00
James Allen
db9632f8f2 Allow modules to inject parts of views 2014-09-08 15:40:46 +01:00
Henry Oswald
f1372fc449 moved button, not that pretty 2014-09-05 16:11:19 +01:00
Henry Oswald
ff0365c157 change plan has multi currency view 2014-09-05 15:47:08 +01:00
Henry Oswald
08e61efeb6 added some whitespace betten translations 2014-09-05 13:12:23 +01:00
Henry Oswald
08cebe369d close dropdown on click 2014-09-05 12:16:02 +01:00
Henry Oswald
eeb27062a0 added currency query string param to subscribe button 2014-09-05 11:40:14 +01:00
Henry Oswald
13a667f47a v1 of multi currency 2014-09-04 19:03:04 +01:00
Henry Oswald
c4a379075d Merge branch 'master' of https://github.com/sharelatex/web-sharelatex 2014-09-02 10:49:43 +01:00
Henry Oswald
6a4ddd937b Merge pull request #104 from watercrossing/fixSpace 
Add missing white space
 2014-09-02 10:34:08 +01:00
watercrossing
81b543bbaa Add space at end of line 2014-09-01 20:14:49 +01:00
Henry Oswald
54b9cdc3e4 new ab framework up and running 2014-09-01 17:48:09 +01:00
Henry Oswald
62f207c368 added basic new a/b test funnely framework 2014-09-01 15:14:08 +01:00
Henry Oswald
f3c04feda7 added a missing templates button back into templates index page 2014-09-01 15:13:37 +01:00
Henry Oswald
03137d4271 made more room for bottom left part of footer as it wraps some time in spanish 2014-08-29 15:29:51 +01:00
Henry Oswald
cffcdbae18 fixed formatting $ and % 2014-08-29 13:49:37 +01:00
Henry Oswald
ce3db55624 improved annual plans view 2014-08-29 13:40:35 +01:00
Henry Oswald
e67d3889f9 got better logic and copy for upgrade annual plans, needs i18n next 2014-08-29 12:36:36 +01:00
Henry Oswald
50890af0cf Merge branch 'master' of https://github.com/sharelatex/web-sharelatex 2014-08-29 12:35:37 +01:00
James Allen
d7e2b19852 Remove your card will charged message since it doesn't apply to free trials 2014-08-29 10:23:11 +01:00
Henry Oswald
350b95a0a5 annual upgrade page works, needs a bit of copy love now 2014-08-28 18:14:31 +01:00
Henry Oswald
f5618e9d9c added confirm you want to change plan modal 
added page and corisponding endpoint to migrate to annual plan
 2014-08-27 17:51:10 +01:00
Henry Oswald
d0d08824da modal asking users to confirm a change of plan 2014-08-27 13:21:39 +01:00
Henry Oswald
b99e933266 fixed jade formating prob causing console error 2014-08-27 11:09:22 +01:00
Henry Oswald
67fdd73472 fixed template problem with next billing details 2014-08-26 20:18:56 +01:00
Henry Oswald
3b41a6eef4 change spacing on footer due to i18n problems 2014-08-26 16:59:42 +01:00
Henry Oswald
54f083820a translate footer text 2014-08-26 12:29:27 +01:00
Henry Oswald
97b118c2ac added in couple of missing translations 2014-08-24 17:12:22 +01:00
Henry Oswald
27b9cad8ca make ga experiements per page 2014-08-24 17:07:40 +01:00
Henry Oswald
705c282b0a changed ga injection 2014-08-23 19:02:41 +01:00
Henry Oswald
c91e95d593 Merge branch 'master' of https://github.com/sharelatex/web-sharelatex 2014-08-22 14:22:12 +01:00
Henry Oswald
6c131b1084 - removed free trial on annual accounts 
- added setting val for google analytics experiments to be added in head
- added 14 day free trial variation to plans page
 2014-08-22 14:20:39 +01:00
James Allen
0152f42416 Put template settings on client side 2014-08-22 13:10:32 +01:00
James Allen
c8ab1bd394 Merge branch 'master' of github.com:sharelatex/web-sharelatex 2014-08-22 12:52:31 +01:00
James Allen
456d194dbb Merge branch 'james_tmp' 2014-08-22 12:51:35 +01:00
Henry Oswald
fd8221b869 make it possible to hide a lng 2014-08-21 17:58:25 +01:00
Henry Oswald
e144f9c19a changed key for profile complete 2014-08-21 12:48:55 +01:00
Henry Oswald
dd8ca9ca0e changed key Actions -> actions 2014-08-21 12:45:19 +01:00
Henry Oswald
daec56359f rename != delete tooltip 2014-08-21 04:41:06 +01:00
James Allen
c4b91de8e8 Layout templates in rows of four 2014-08-20 14:58:01 +01:00
James Allen
d0eee7a1e5 Refactor template settings 2014-08-20 14:47:27 +01:00
Henry Oswald
c51c0c1cf2 fixed misconfig translate string 2014-08-20 14:40:27 +01:00
Henry Oswald
3cd43ddd86 found sneaky missing translations 2014-08-20 14:31:44 +01:00
Henry Oswald
8d51fcc457 hide translations notification on editor page 2014-08-20 14:08:59 +01:00
Henry Oswald
21f288fbe5 missed off few tooltips in translation 2014-08-20 13:47:45 +01:00
Henry Oswald
8e4974d559 fix more escaping html 2014-08-20 12:45:29 +01:00
Henry Oswald
c1c46a36b9 render html of bonus page para 2014-08-20 08:14:36 +01:00
James Allen
156c6ec4b6 Add PDF viewer label in 2014-08-19 14:40:10 +01:00
Henrique Dias
e0e9949da5 dynamic template menu by config settings 2014-08-18 14:26:47 -03:00
James Allen
02ec2bc264 Align flags on left of menu to match flag in footer 2014-08-14 16:41:48 +01:00
James Allen
ac4b3663cb CSS tweaks to i18n stuff 2014-08-14 16:33:01 +01:00
Henry Oswald
aa4f748608 Merge branch 'master' into i18n 2014-08-14 15:42:54 +01:00
Henry Oswald
f75838b353 don't show the lng select if there is only 1 lang to show 2014-08-14 15:42:31 +01:00
Henry Oswald
7c2beb5d2d added correct flags 2014-08-14 13:00:04 +01:00
James Allen
7816810249 Add in poll dropbox endpoint back into admin 2014-08-14 10:12:01 +01:00
Henry Oswald
02cdfb4d09 lng dropdown at bottom in footer works nicely, needs few style tweeks 2014-08-13 23:06:15 +01:00
James Allen
670e8e5cb9 Use Dropbox Real-time polling 2014-08-13 17:26:18 +01:00
Henry Oswald
7389943089 added ugly list of available subdomains 2014-08-13 16:04:49 +01:00
James Allen
2a6041752d Remove unescaped strings on bonus page 2014-08-13 15:44:30 +01:00
Henry Oswald
041e85b92b added local cooked option to hide notification 2014-08-13 14:14:31 +01:00
Henry Oswald
2222b32321 added message at top of page offering redirect to local lng 2014-08-13 12:31:14 +01:00
James Allen
6bfefea5cb Show PDF button in toolbar if file tree is closed in PDF flat view 2014-08-12 13:18:22 +01:00
James Allen
93f2969be5 Change style on file rename input to avoid weird Chrome behaviour 2014-08-12 12:46:05 +01:00
James Allen
5b3bf5c956 Spaces after error titles 2014-08-12 12:30:07 +01:00
James Allen
3348249dcd Download template PDF and zip file with good file names 2014-08-12 12:02:09 +01:00
James Allen
2aa421233c Add meta description for templates home page 2014-08-11 16:20:27 +01:00
Henry Oswald
f452f0ee19 don't escpae html on delete modal 2014-08-11 08:01:39 +01:00
James Allen
8320970a29 ngcloak template button while loading 2014-08-08 14:05:40 +01:00
James Allen
af1f0994af Remove priority title stuff again 2014-08-07 16:53:01 +01:00
James Allen
31e3c4ac06 Merge branch 'master' of github.com:sharelatex/web-sharelatex 2014-08-07 16:12:11 +01:00
Henry Oswald
da307318d9 fixed unescaped content 2014-08-07 16:11:43 +01:00
James Allen
240dae0cff Provide template description as meta tag 
Conflicts:
	app/views/layout.jade
 2014-08-07 16:11:32 +01:00
James Allen
b367c4a968 Show group subscription status on subscription dashboard page 
Conflicts:
	app/views/subscriptions/dashboard.jade
 2014-08-07 15:51:43 +01:00
Henry Oswald
06c83dfcfa fixed missing title val 2014-08-07 15:15:07 +01:00
Henry Oswald
9c6f0faff6 Merge branch 'i18n' 
Conflicts:
	app/coffee/Features/User/UserPagesController.coffee
	app/views/layout.jade
	app/views/project/editor/dropbox.jade
	app/views/project/editor/file-tree.jade
	app/views/project/editor/pdf.jade
	app/views/project/list/project-list.jade
	app/views/user/settings.jade
 2014-08-07 14:46:17 +01:00
Henry Oswald
a337b8e848 fixed jade error in track changes 2014-08-07 14:31:03 +01:00
Henry Oswald
ecd5d5274c Merge branch 'master' of https://github.com/sharelatex/web-sharelatex 2014-08-07 13:56:17 +01:00
Henry Oswald
c961cea514 fixed some bits 2014-08-07 13:56:04 +01:00
Henry Oswald
01b7f61e6b added check if other langs are enabled for put the header rel link in 2014-08-06 15:35:57 +01:00
Henry Oswald
673def4f90 added different lang links to head for google 2014-08-06 15:05:13 +01:00
James Allen
07a2955341 Add in timeout documentation link to error message 2014-08-05 17:16:34 +01:00
James Allen
0111d699a3 Move sort click action to just the header text, not select all input 2014-08-05 17:10:24 +01:00
James Allen
a7cf8d6b0a Sort out title of wiki 2014-08-05 17:08:38 +01:00
Henry Oswald
9baea1edc1 removed lang dropdown 2014-08-05 11:35:23 +01:00
Henry Oswald
90395af6b8 nav bar text is now translated but uses key as the string if it can't be translated 2014-08-05 11:24:18 +01:00
Henry Oswald
03db0bc797 added ugly dropdown for testing 2014-08-01 14:43:06 +01:00
Henry Oswald
1b8c8b8c48 sorted out titles 2014-08-01 13:47:14 +01:00
Henry Oswald
fdc5a5154a added a load more pages 2014-08-01 12:34:53 +01:00
James Allen
2ea7dee682 Add card around wiki content to make it stand out 2014-08-01 08:51:01 +01:00
Henry Oswald
cb685f5ea6 done loads of more pages 2014-07-31 17:07:43 +01:00
James Allen
55ad2ce78d Include contents page down side of wiki 2014-07-31 16:26:02 +01:00
James Allen
be725c50ba Make right click on menus behave like native right click 2014-07-31 14:20:56 +01:00
Henry Oswald
ab10d84f6a did some of the forms 2014-07-31 14:01:37 +01:00
Henry Oswald
43750e9cb6 converted plans page 2014-07-31 13:38:24 +01:00
James Allen
bc2147993a Show project path in Dropbox folder 2014-07-31 13:04:55 +01:00
James Allen
e1c14b0cf8 Mask iframe so resizer can go over native PDF 2014-07-31 13:04:55 +01:00
Henry Oswald
5f8bb9ea1f converted settings page 2014-07-31 11:54:19 +01:00
Henry Oswald
42c63dd5a2 equals checks work, uses id now as well. Taken from: 
http://blog.brunoscopelliti.com/angularjs-directive-to-check-that-passwords-match
the old one from SO does not seem to work any more
 2014-07-31 11:16:13 +01:00
Henry Oswald
270c92c2a2 converted project list page 
added missing js files
 2014-07-30 17:18:45 +01:00
Henry Oswald
49c7d52208 i18n is cleaned and working with requirejs 2014-07-30 16:13:02 +01:00
Henry Oswald
9631d4da98 much simpler version of interpolation 2014-07-30 16:06:53 +01:00
Henry Oswald
7344f745e4 example of interpolation working 2014-07-30 16:04:26 +01:00
James Allen
49258fe3dd Proxy to wiki 2014-07-30 15:44:03 +01:00
Henry Oswald
1a8c3d17b2 working example of directive for i18n new project button 2014-07-30 15:05:13 +01:00
Henry Oswald
bdf1fed462 jquery translations work 2014-07-30 14:22:36 +01:00
Henry Oswald
48f019236e added first translations 2014-07-29 15:33:31 +01:00
Henry Oswald
39173fe583 Merge branch 'i18n' 
Conflicts:
	app/coffee/infrastructure/Server.coffee
	app/views/project/list.jade
	package.json
 2014-07-29 13:44:10 +01:00
James Allen
1f44cc4375 Fix alignment of 'view all templates' 2014-07-29 11:35:56 +01:00
Henry Oswald
f821c38a9f Merge branch 'master' of https://github.com/sharelatex/web-sharelatex 2014-07-29 10:55:29 +01:00
Henry Oswald
dff74cf5cb hide dropbox in left menu if you are not the admin 2014-07-29 10:55:22 +01:00
James Allen
25205e3dda Update to official mathjax cdn 2014-07-29 10:37:43 +01:00
James Allen
fc7753d49d Add in download PDF button 2014-07-28 17:24:43 +01:00
Henry Oswald
9354d61aa3 fixed delete account validation 
not using angular equals which does not seem to work
 2014-07-28 16:52:25 +01:00
James Allen
a5267184ab Don't use dark theme yet 2014-07-28 15:57:06 +01:00
James Allen
db920f7aaf Merge branch 'master' of github.com:sharelatex/web-sharelatex 2014-07-28 15:06:39 +01:00
James Allen
4ff9fe33b6 Use a dark editor surround if the theme is dark 2014-07-28 15:06:26 +01:00
Henry Oswald
d4be1ba7aa changed template image paths to use correct ones 2014-07-28 12:50:56 +01:00
James Allen
ce47f75058 Show timedout errors properly 2014-07-28 10:22:27 +01:00
Henry Oswald
1603957571 Merge branch 'master-redesign' of https://github.com/sharelatex/web-sharelatex into master-redesign 2014-07-25 14:21:48 +01:00
James Allen
e8c5679954 Update styles for homepage 2014-07-25 14:14:27 +01:00
Henry Oswald
c0f5894edb Merge branch 'master-redesign' of https://github.com/sharelatex/web-sharelatex into master-redesign 2014-07-25 13:14:22 +01:00
Henry Oswald
40dbeb1fe7 fixed missing fingerprint 2014-07-25 12:52:17 +01:00
James Allen
9aa8682082 Add group plan enquiry form 2014-07-25 12:32:26 +01:00
Henry Oswald
5a336ed7ef Merge branch 'master-redesign' of https://github.com/sharelatex/web-sharelatex into master-redesign 2014-07-25 12:20:11 +01:00
Henry Oswald
d7814e354b replace underscore with space in template names 2014-07-25 12:20:08 +01:00
James Allen
cb5206a49e Convert plans page to use free trials 2014-07-25 12:10:56 +01:00
Henry Oswald
726719ce3f changed html autofocus to an angular directive 
autofocus is html5y and worked on chrome but not firefox for me.
 2014-07-24 14:57:56 +01:00
Henry Oswald
b15adefed7 Merge branch 'master-redesign' of https://github.com/sharelatex/web-sharelatex into master-redesign 2014-07-24 14:06:33 +01:00
Henry Oswald
787a3adad3 killed changelog 2014-07-24 14:05:20 +01:00
James Allen
0938186868 Don't show system messages in editor 2014-07-24 14:04:26 +01:00
James Allen
5c18f4fe02 Sexy project list resizing 2014-07-24 14:02:14 +01:00
Henry Oswald
2ffe093952 removed unused bonus jade files 2014-07-24 13:58:02 +01:00
Henry Oswald
7255231abc Merge branch 'master-redesign' of https://github.com/sharelatex/web-sharelatex into master-redesign 
updated upstream into a topic branch.
 2014-07-24 13:57:49 +01:00
James Allen
06ca7c904e Merge branch 'master-redesign' of github.com:sharelatex/web-sharelatex into master-redesign 2014-07-24 13:24:20 +01:00
James Allen
1128b45b17 Add in system messages 2014-07-24 13:24:08 +01:00
Henry Oswald
67cba0dfd2 killed info controller and setup features.less for dropbox and feature pages 
also moved dropbox to external pages
 2014-07-24 12:15:54 +01:00
Henry Oswald
a8deac697c Merge branch 'master-redesign' of https://github.com/sharelatex/web-sharelatex into master-redesign 2014-07-24 11:29:11 +01:00
Henry Oswald
a7b678a2c0 removed dropbox template that is not needed 2014-07-24 11:29:05 +01:00
Henry Oswald
49f356b38f removed advisor and themes page 2014-07-24 11:23:53 +01:00
James Allen
fbd36d8b07 Sort of style of admin panel and trim functionality 2014-07-24 11:22:22 +01:00
James Allen
596619633d Merge branch 'master-redesign' of github.com:sharelatex/web-sharelatex into master-redesign 2014-07-23 15:56:22 +01:00
James Allen
a459a178b3 Retina favicon 2014-07-23 15:56:15 +01:00
Henry Oswald
e60c67d7e4 moved the left hand pdf link to the top 2014-07-23 14:44:44 +01:00
Henry Oswald
e46bc51c67 Merge branch 'master-redesign' of https://github.com/sharelatex/web-sharelatex into master-redesign 2014-07-23 12:17:14 +01:00
Henry Oswald
83b94f987c cleaned up few small things with templates 2014-07-23 12:16:31 +01:00
James Allen
077f87f1d3 Merge branch 'master-redesign' of github.com:sharelatex/web-sharelatex into master-redesign 2014-07-23 12:05:31 +01:00
Henry Oswald
395b1ebf47 Merge branch 'master-redesign' of https://github.com/sharelatex/web-sharelatex into master-redesign 2014-07-23 11:29:43 +01:00
Henry Oswald
e39e6c86a1 moved where we write the window.sharelatex.x to the header as some 
times it is possible for the scripts to evaulate before those props
have been read in
 2014-07-23 11:29:04 +01:00
James Allen
2218acdc3b Add close buttons to modals 2014-07-23 11:26:45 +01:00
Henry Oswald
a9d8be8dec brought up the sections of templates to be closer to the search box 2014-07-23 11:26:17 +01:00
James Allen
bbaf024f14 Merge branch 'master-redesign' of github.com:sharelatex/web-sharelatex into master-redesign 2014-07-23 11:22:12 +01:00
James Allen
cca50cf64c Auto focus login, register and password fields 2014-07-23 11:18:42 +01:00
James Allen
96e99a5cc0 Minor project list tweaks 2014-07-23 11:12:12 +01:00
James Allen
532ec5e756 Make project list look better on a smaller screen 2014-07-23 11:08:55 +01:00
Henry Oswald
c6ab4c4f7b roughly styled template search results 
clear button in template search also clears results
 2014-07-22 17:43:17 +01:00
Henry Oswald
25ea01115a Merge branch 'master-redesign' of https://github.com/sharelatex/web-sharelatex into master-redesign 2014-07-22 17:24:51 +01:00
Henry Oswald
a4b02558dc 'carded' the templates page, top search area still needs doing 2014-07-22 17:24:32 +01:00
James Allen
20a5d3742a Merge branch 'master-redesign' of github.com:sharelatex/web-sharelatex into master-redesign 2014-07-22 17:09:52 +01:00
James Allen
dfb82015f7 Style blog and lighten text 2014-07-22 17:09:44 +01:00
Henry Oswald
a20b46c786 template page looks ok, not quite like adam did. 
Need to battle left padding still
 2014-07-22 15:56:36 +01:00
Henry Oswald
234bc5e0e9 Merge branch 'master-redesign' of https://github.com/sharelatex/web-sharelatex into master-redesign 2014-07-22 14:56:41 +01:00
Henry Oswald
806ebc977c templates index page looks roughly correct 2014-07-22 14:56:33 +01:00
James Allen
a4209000dc Merge branch 'master-redesign' of github.com:sharelatex/web-sharelatex into master-redesign 2014-07-22 14:38:51 +01:00
James Allen
c099b8e9de Add hotkeys modal 2014-07-22 14:38:32 +01:00
Henry Oswald
c95730dd63 Merge branch 'master-redesign' of https://github.com/sharelatex/web-sharelatex into master-redesign 2014-07-22 13:42:37 +01:00
James Allen
688842de3c Allow full screen PDF 2014-07-22 13:33:01 +01:00
Henry Oswald
2c7d19d79b Merge branch 'master-redesign' of https://github.com/sharelatex/web-sharelatex into master-redesign 2014-07-22 12:31:34 +01:00
Henry Oswald
2246e9c934 blog looks basically like adams 2014-07-22 12:31:19 +01:00
James Allen
cb57c2f28d Tweak css and style on homepage 2014-07-22 11:50:15 +01:00
James Allen
3a13dac7ab Merge branch 'master-redesign' of github.com:sharelatex/web-sharelatex into master-redesign 2014-07-21 17:56:28 +01:00
Henry Oswald
aa3cd06d72 add trailing space for better spacing on register message 2014-07-21 17:32:16 +01:00
Henry Oswald
535a3c67cd added template for bonus page with html linking to us 2014-07-21 16:41:22 +01:00
James Allen
b5cfe06645 Don't show options that don't make sense for anonymous users 2014-07-21 16:10:21 +01:00
James Allen
1d6314a2c1 add Ctrl-Enter hotkey 2014-07-21 15:39:15 +01:00
James Allen
3468460ed6 Show progress before any js loads 2014-07-21 15:11:54 +01:00
James Allen
2b85ebf8ec Allow root doc to be set 2014-07-21 15:09:19 +01:00
Henry Oswald
82914b6fe5 Merge branch 'master-redesign' of https://github.com/sharelatex/web-sharelatex into master-redesign 2014-07-21 13:14:08 +01:00
James Allen
98d601fb66 Only show synctex controls when pdf layout is open 2014-07-21 12:30:34 +01:00
James Allen
1cf508356c Show 'no messages' state in chat 2014-07-21 12:19:13 +01:00
James Allen
4151f5d85f Disable chat for anonymous users 2014-07-21 11:56:49 +01:00
James Allen
6212b1c375 Append header tooltips to body 2014-07-21 11:38:19 +01:00
Henry Oswald
57ad5e4182 - migrated event tracking to new pages/angular 
- hooked up the search field on projects to search on keypress
 2014-07-21 11:35:05 +01:00
Henry Oswald
0868ce9cc7 send user details on modal dismiss. Role uses same autocomplete lib as institution 2014-07-18 14:08:53 +01:00
Henry Oswald
533b51146e Merge branch 'master-redesign' of https://github.com/sharelatex/web-sharelatex into master-redesign 2014-07-18 13:20:40 +01:00
Henry Oswald
175882dc67 changed role to datalist because im fed up of not being able to fix it. Datalist are not styled but its not that bad 2014-07-18 13:20:35 +01:00
James Allen
b532461232 Style project sorting with a cleaner look 2014-07-18 12:20:12 +01:00
James Allen
b785ab4d15 Fix broken project list page 2014-07-18 12:18:05 +01:00
James Allen
462403bb4f Finger print Ace files 2014-07-18 12:08:56 +01:00
Henry Oswald
57b461e0ff added little icons to the table for when you want to sort 2014-07-18 10:43:32 +01:00
Henry Oswald
ca6e8a7d40 basic sorting added to project list page 2014-07-17 17:34:09 +01:00
Henry Oswald
c683eab9e2 change the scribtex modal to be bootstrap3/angular, same content and same logic if it should be shown or not 2014-07-17 17:05:39 +01:00
James Allen
2cf8f8c56f Merge branch 'master-redesign' of github.com:sharelatex/web-sharelatex into master-redesign 2014-07-17 15:35:06 +01:00
James Allen
9ed93b3a81 Make colors consistent everywhere 2014-07-17 15:33:38 +01:00
Henry Oswald
fc02f99659 made restricted page like 404, also got dropbox progress bar going the other way 2014-07-17 15:26:31 +01:00
James Allen
37a12e88c1 Show who is online 2014-07-17 15:25:22 +01:00
Henry Oswald
c429bd1f44 improved the dropbox progress bar 2014-07-17 15:08:12 +01:00
Henry Oswald
b54c351956 Merge branch 'master-redesign' of https://github.com/sharelatex/web-sharelatex into master-redesign 2014-07-17 14:23:55 +01:00
Henry Oswald
5fa83fb2b9 added dropbox in left menu 2014-07-17 14:23:47 +01:00
James Allen
3995de3cfc Add in project cloning to editor 2014-07-17 14:04:21 +01:00
James Allen
a3faaf0c18 Add in mathjax directive 2014-07-17 13:23:43 +01:00
James Allen
d531e3b393 Fix overlapping issues when name is empty in track changes list 2014-07-17 13:03:29 +01:00
James Allen
ee7013c1ee TRack free trial clicks and redirect to subscription page 2014-07-17 12:57:17 +01:00
James Allen
05b078ec92 New File => Folder in folder modal 2014-07-17 12:03:26 +01:00
James Allen
8d946e68d2 Return better blank gravatar image 2014-07-17 11:07:34 +01:00
James Allen
c6f51cf5ac Show new chat message notification 2014-07-17 11:05:08 +01:00
James Allen
9064a9d9df Append project list tooltips to body 2014-07-16 17:04:17 +01:00
James Allen
9ce746c6c5 Tweak menu style 2014-07-16 17:01:41 +01:00
James Allen
8e1593bb96 Merge branch 'master-redesign' of github.com:sharelatex/web-sharelatex into master-redesign 2014-07-16 16:58:25 +01:00
James Allen
c24fe212a9 Fix PDF position tracking 2014-07-16 16:58:12 +01:00
Henry Oswald
55eb15baba changed the icon for templates in the left menu 2014-07-16 16:20:31 +01:00
Henry Oswald
4f91e40875 Merge branch 'master-redesign' of https://github.com/sharelatex/web-sharelatex into master-redesign 2014-07-16 15:53:12 +01:00
Henry Oswald
f3f53a99d0 Templates state resets on modal close so if the api comes back it will work 2014-07-16 15:50:27 +01:00
James Allen
14a9d0838e Get line wrapping of long tag names sorted 2014-07-16 15:24:30 +01:00
James Allen
1d79f3bec3 Don't close folder menu on modal pop up 2014-07-16 15:04:37 +01:00
James Allen
a924f2a928 Rephrase shared projects 2014-07-16 15:01:06 +01:00
James Allen
f34811fbf6 Add new folder link in side bar 2014-07-16 14:59:52 +01:00
Henry Oswald
735bc9e53d show message when can not talk to templates api 2014-07-16 13:36:02 +01:00
Henry Oswald
abc4306e06 merge 2014-07-16 13:35:15 +01:00
James Allen
4b3610746e Use native select box style in left menu 2014-07-16 12:09:19 +01:00
Henry Oswald
eb58bb7c5a all template buttons in editor are disabled on publish/unpublish 2014-07-16 12:04:33 +01:00
James Allen
60174ffb09 Style closed page 2014-07-16 11:59:54 +01:00
James Allen
2dc43b504c Style 404 page 2014-07-16 11:59:25 +01:00
Henry Oswald
6982ec63ae changed get template details to findOne 2014-07-16 11:56:22 +01:00
James Allen
9e0d5ff890 Use permissions.admin, not hasPermission(...) 2014-07-16 11:50:03 +01:00
James Allen
4a139949f2 Merge branch 'master-redesign' of github.com:sharelatex/web-sharelatex into master-redesign 2014-07-16 11:29:02 +01:00
James Allen
8f08823d34 Sort out fingerprints and pdf.js worker path 2014-07-16 11:28:52 +01:00
Henry Oswald
c8c0030b7c Merge branch 'master-redesign' of https://github.com/sharelatex/web-sharelatex into master-redesign 2014-07-16 11:02:53 +01:00
Henry Oswald
46377aea3d the template link in the left menu is only shown to owners/admins 2014-07-16 11:02:45 +01:00
James Allen
1d7a595c6c Small chat scroll tweaks 2014-07-16 10:52:06 +01:00
James Allen
e0266e309f Put project link in header 2014-07-15 20:44:13 +01:00
James Allen
7318f4c2d3 Merge branch 'master-redesign' of github.com:sharelatex/web-sharelatex into master-redesign 2014-07-15 18:25:29 +01:00
James Allen
b9f2b02594 Sort out scroll in chat 2014-07-15 18:25:12 +01:00
Henry Oswald
c93c8b3f7d got basic client side templates 2014-07-15 17:56:09 +01:00
Henry Oswald
ef4b7f7036 Merge branch 'master-redesign' of https://github.com/sharelatex/web-sharelatex into master-redesign 2014-07-15 12:15:15 +01:00
James Allen
cf0ff6e97a Hide chat in editor 2014-07-15 10:56:01 +01:00
Henry Oswald
5093820a5f Merge branch 'master-redesign' into master-redesign-templates-and-blog 2014-07-14 12:42:03 +01:00
James Allen
e4d9d03f55 Improve feedback on login/register forms 2014-07-11 17:08:19 +01:00
James Allen
1c5778e2c4 List number of changes in diff 2014-07-11 16:34:12 +01:00
James Allen
76415ae02b Show labels for tracked changes above and below 2014-07-11 16:17:59 +01:00
James Allen
0a2d93011f Add in restore button for diffs 2014-07-11 13:55:14 +01:00
Henry Oswald
c0a6f0b7ad Merge branch 'master-redesign' into master-redesign-templates-and-blog 
Conflicts:
	public/coffee/ide/editor/directives/aceEditor/auto-complete/AutoCompleteManager.coffee
	public/coffee/ide/editor/directives/aceEditor/cursor-position/CursorPositionManager.coffee
	public/coffee/ide/online-users/OnlineUsersManager.coffee
	public/coffee/ide/track-changes/directives/infiniteScroll.coffee
 2014-07-10 15:15:18 +01:00
Henry Oswald
025d3147ec blog intergration works 2014-07-10 14:53:53 +01:00
James Allen
1ce5062800 Add in link to go back to projects 2014-07-10 14:08:32 +01:00
Henry Oswald
5cf756969e blog wip 2014-07-09 19:49:39 +01:00
James Allen
c93902345a Remove all console.log debug statements 2014-07-09 16:18:09 +01:00
James Allen
b0f43eab19 Use events for updating cursor = big performance gain 2014-07-09 15:38:38 +01:00
James Allen
07debb2450 Fix some more project list style issues 2014-07-09 14:56:25 +01:00
James Allen
f2066e46dd Use Angular 1.30 and only update emails on blur 2014-07-09 14:53:30 +01:00
James Allen
f6c2feff2d Improve styling of project list with long titles and labels 2014-07-09 11:51:21 +01:00
James Allen
488f33d3d0 Replace slashes globally 2014-07-09 11:17:16 +01:00
James Allen
6d10c186ad Sort out escaping issues 2014-07-09 11:05:00 +01:00
James Allen
4423471b1a Auto resize project list to always fit in screen 2014-07-08 17:47:20 +01:00
James Allen
d9d1499dae Ignore external pages 2014-07-08 13:36:08 +01:00
James Allen
2f92856db4 Provide more config options for nav and footer entries 2014-07-08 12:51:11 +01:00
Henry Oswald
0080809489 merge/moving js stuff around half done 2014-07-08 12:32:50 +01:00
James Allen
b9909bbd84 Sort out front end coffee/js files and minification 2014-07-08 12:01:32 +01:00
Henry Oswald
32b5e39681 chat scoll works fairly well using scroll glue 2014-07-08 11:56:44 +01:00
Henry Oswald
6dc9d32104 Merge branch 'master-redesign' into master-redesign-templates-and-blog 
Conflicts:
	public/coffee/app/main.coffee
 2014-07-08 11:14:56 +01:00
Henry Oswald
581d9ec925 - hooked up chat throughout the stack 
- removed lots of console.logs
- working on the auto scrol, doesn't quite work yet
 2014-07-08 10:08:38 +01:00
James Allen
8525bf4a72 Get group admin page working with angular and new style 2014-07-07 18:06:12 +01:00
James Allen
c542116b41 Fix role autocomplete 2014-07-07 16:25:18 +01:00
James Allen
5d62775ab6 Fix auto complete in user profile 2014-07-07 16:22:38 +01:00
James Allen
068d88ec0b Style bonus page 2014-07-07 15:54:40 +01:00
James Allen
41ef675999 Improve UX of user profile 2014-07-07 14:58:12 +01:00
James Allen
452098ca68 Redirect to register if not registered on plans page 2014-07-07 14:05:07 +01:00
James Allen
5f48105b04 Style subscription management pages 2014-07-07 13:43:36 +01:00
James Allen
7947eb28ad Remove ab test from plans page 2014-07-07 12:30:19 +01:00
James Allen
b3bfa2dc26 Add plans page 2014-07-07 12:27:58 +01:00
Henry Oswald
34ac6b03cd Merge branch 'master-redesign' into master-redesign-templates-and-blog 2014-07-07 10:54:50 +01:00
James Allen
773b457d24 Group messages from the same person together 2014-07-04 15:46:21 +01:00
Henry Oswald
86a9d08e5c Merge branch 'master-redesign' into master-redesign-templates-and-blog 2014-07-04 13:06:47 +01:00
James Allen
ac0f05a9e4 Create binary file preview 2014-07-03 17:05:50 +01:00
James Allen
af870c8269 Style project name and allow renaming 2014-07-03 16:18:49 +01:00
James Allen
a8d371d2f6 Sort out permissions and displaying anonymous users 2014-07-03 15:05:35 +01:00
James Allen
58e4e92d84 Add in upgrade pop up to history 2014-07-03 11:18:15 +01:00
James Allen
a13ee00e91 Allow dragging into the root folder 2014-07-03 11:01:41 +01:00
James Allen
a4afc70f9b Show saving notifications 2014-07-02 17:41:07 +01:00
James Allen
b61da1a9f0 Handle out of sync errors with a pop-up 2014-07-02 17:04:29 +01:00
Henry Oswald
b81fac1cf4 Merge branch 'master-redesign' into master-redesign-templates-and-blog 2014-07-02 15:58:30 +01:00
Henry Oswald
ba4d585854 Merge branch 'master-redesign' into master-redesign-templates-and-blog 2014-07-02 15:56:22 +01:00
James Allen
f256c96195 Add in chat view with stubbed data 2014-07-02 15:56:09 +01:00
James Allen
926b31b337 Fix a few ui bugs 2014-07-02 13:29:56 +01:00
James Allen
ab09a865b8 Add in chat pane and sort out layout resizing 2014-07-02 13:23:04 +01:00
James Allen
83666be910 Disabled pdf download if not available 2014-07-02 11:06:20 +01:00
James Allen
f86c9cf853 Move all editor manager binding logic into the managers 2014-07-02 10:59:18 +01:00
Henry Oswald
55d20e8abd change format of algolia settings 2014-07-01 16:45:20 +01:00
James Allen
beae4f2424 Style settings side panel 2014-07-01 16:03:14 +01:00
James Allen
7cfbaaca36 Style settings side panel 2014-07-01 15:57:55 +01:00
Henry Oswald
000be22f16 Merge branch 'master-redesign' into master-redesign-templates-and-blog 
Conflicts:
	app/views/project/editor.jade
 2014-07-01 15:23:05 +01:00