alois/Verso
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,012 Commits 8 Branches 11 Tags
cc71834e4e6a12b7cdf18c460d2534a09b968892
Commit Graph
306 Commits
Author SHA1 Message Date
Henry Oswald 4c073ff285 render template name in CanonicalPage 2014-08-08 14:43:07 +01:00
James Allen b20934e579 Merge branch 'master' of github.com:sharelatex/web-sharelatex 2014-08-08 11:42:02 +01:00
James Allen 10021986c5 Don't error on password reset if no email found, and translate error messages 2014-08-08 11:41:54 +01:00
Henry Oswald 66ba6e612d Revert "send 401 when login fails" 
This reverts commit fb901c6365d37654ba9058f57a71a4e60366688e.
 2014-08-08 10:21:17 +01:00
Henry Oswald 7976f2f0fe send 401 when login fails 2014-08-07 16:28:00 +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 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 c961cea514 fixed some bits 2014-08-07 13:56:04 +01:00
James Allen a7cf8d6b0a Sort out title of wiki 2014-08-05 17:08:38 +01:00
Henry Oswald 1e0652888a removed console.log 2014-08-04 12:21:38 +01:00
Henry Oswald d047d44079 Changed the error messages which are sent down to the client to be translated first 
fixed up tests from titles we check when rendering, deleted them as they never
catch anything important, more hastle than they are worth imo.
 2014-08-01 14:03:38 +01:00
Henry Oswald 1b8c8b8c48 sorted out titles 2014-08-01 13:47:14 +01:00
James Allen 55ad2ce78d Include contents page down side of wiki 2014-07-31 16:26:02 +01:00
James Allen 13c6fcb8d9 Handle encoded parameters in request URL to wiki 2014-07-31 13:12:24 +01:00
James Allen 94bcfc0eac Only store host, not path in wiki URL setting 2014-07-30 15:56:27 +01:00
James Allen 49258fe3dd Proxy to wiki 2014-07-30 15:44:03 +01:00
Henry Oswald f906d63067 added some logging around dropbox update 2014-07-29 10:32:11 +01:00
Henry Oswald 344d32d4e8 fixed email logo link 2014-07-29 10:29:40 +01:00
Henry Oswald 2267a484f4 added /home so in dev can easily see home page when logged in 2014-07-28 17:04:17 +01:00
Henry Oswald b7c6af1341 /home goes to home page, so can look at it when logged in 2014-07-25 14:17:40 +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
Henry Oswald 17962426ea blog returns 404's if the page does not exist in blog 2014-07-23 12:16:52 +01:00
Henry Oswald 83b94f987c cleaned up few small things with templates 2014-07-23 12:16:31 +01:00
Henry Oswald a4b02558dc 'carded' the templates page, top search area still needs doing 2014-07-22 17:24:32 +01:00
Henry Oswald 46027128a4 change notifications email top header to the grey we use on the site 2014-07-21 15:52:55 +01:00
Henry Oswald 1322f3e183 Merge branch 'master-redesign' of https://github.com/sharelatex/web-sharelatex into master-redesign 2014-07-21 14:18:43 +01:00
Henry Oswald 375669cd3b changed emails to adams design. Does not render brilliantly in gmail, but overall not bad. 2014-07-21 14:18:11 +01:00
James Allen a3a5aa1c0d Remove server-side santization of project name, it's all escaped client side now 2014-07-21 13:34:25 +01:00
James Allen 1c68ea7328 Don't care if user key has expired when we receive a cursor update 2014-07-21 13:16:07 +01:00
Henry Oswald 554fd7c7d0 change client connection timeout to 15 mins expire in redis 2014-07-17 16:03:53 +01:00
James Allen 37a12e88c1 Show who is online 2014-07-17 15:25:22 +01:00
James Allen e0f1ed3c10 Use internal url for chat 2014-07-17 11:43:12 +01:00
Henry Oswald f4b0dec1b8 changed api-key to read-only-api-key for angolia 2014-07-16 16:37:58 +01:00
Henry Oswald abc4306e06 merge 2014-07-16 13:35:15 +01:00
Henry Oswald 6982ec63ae changed get template details to findOne 2014-07-16 11:56:22 +01:00
Henry Oswald cd60817592 made getting templates details parallel 2014-07-16 11:37:17 +01:00
James Allen 8f08823d34 Sort out fingerprints and pdf.js worker path 2014-07-16 11:28:52 +01:00
Henry Oswald 91ca726e66 get template details now includes the markdown description of the project 2014-07-16 11:27:47 +01:00
James Allen b9f2b02594 Sort out scroll in chat 2014-07-15 18:25:12 +01:00
Henry Oswald 9f82e63a8f changed :project_id to :Project_id 2014-07-14 22:11:41 +01:00
Henry Oswald 0aa6a206e7 added name and email to connected user data and example get request for chat 2014-07-14 16:23:31 +01:00
Henry Oswald 4a71b38721 added route for getting connected users 2014-07-14 16:16:01 +01:00
Henry Oswald e6dfef6225 added getting connected users controller 2014-07-14 16:01:58 +01:00