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
|
bdf1fed462
|
jquery translations work
|
2014-07-30 14:22:36 +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 |
|
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 |
|
James Allen
|
462403bb4f
|
Finger print Ace files
|
2014-07-18 12:08:56 +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 |
|
Henry Oswald
|
b0cf0666fa
|
changed the redis stuf to multi
|
2014-07-14 15:38:55 +01:00 |
|
Henry Oswald
|
d13676dab2
|
cursor data is stored in redis
|
2014-07-14 15:30:55 +01:00 |
|
Henry Oswald
|
61b7bea203
|
added ttl to the users set to keep redis clean from inactive projects
|
2014-07-14 13:20:29 +01:00 |
|
Henry Oswald
|
2b2b995340
|
refactored updateClientPosition to use async
|
2014-07-14 12:58:55 +01:00 |
|
Henry Oswald
|
5093820a5f
|
Merge branch 'master-redesign' into master-redesign-templates-and-blog
|
2014-07-14 12:42:03 +01:00 |
|
Henry Oswald
|
13aaf042d9
|
connected user manager logic works correctly
|
2014-07-14 12:41:06 +01:00 |
|
James Allen
|
e4d9d03f55
|
Improve feedback on login/register forms
|
2014-07-11 17:08:19 +01:00 |
|
Henry Oswald
|
d737197e95
|
marksUserAsDisconnected -> markUserAsDisconnected
|
2014-07-10 17:01:42 +01:00 |
|
Henry Oswald
|
01ad313133
|
hooked up editor controller to connected users manager
|
2014-07-10 17:01:19 +01:00 |
|
Henry Oswald
|
e1dd58aca8
|
fixed algolia settings and removed some console.logs
|
2014-07-10 16:05:18 +01:00 |
|
Henry Oswald
|
4ccc56723f
|
added disconnect funtion in connected users manager
|
2014-07-10 16:05:05 +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 |
|
Henry Oswald
|
5cf756969e
|
blog wip
|
2014-07-09 19:49:39 +01:00 |
|
James Allen
|
16e382bef2
|
Update Ace and fix autocomplete
|
2014-07-09 17:59:04 +01:00 |
|
James Allen
|
6d10c186ad
|
Sort out escaping issues
|
2014-07-09 11:05:00 +01:00 |
|
James Allen
|
8c56a46594
|
Merge branch 'master' into master-redesign
|
2014-07-08 13:24:48 +01:00 |
|
James Allen
|
2553f51e44
|
Remove unused subscription downgrade logic
|
2014-07-08 12:55:29 +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
|
068d88ec0b
|
Style bonus page
|
2014-07-07 15:54:40 +01:00 |
|
James Allen
|
452098ca68
|
Redirect to register if not registered on plans page
|
2014-07-07 14:05:07 +01:00 |
|
James Allen
|
7947eb28ad
|
Remove ab test from plans page
|
2014-07-07 12:30:19 +01:00 |
|
Henry Oswald
|
d1f907cee5
|
first simple version of tracking who is active in the editor
|
2014-07-04 16:18:46 +01:00 |
|
Henry Oswald
|
de010cf971
|
added error logging
|
2014-07-04 13:29:59 +01:00 |
|
Henry Oswald
|
0d02241b46
|
linked chat into the editor real time contorller
|
2014-07-04 13:20:30 +01:00 |
|
Henry Oswald
|
9c35cfd693
|
very start of chat controllers done
|
2014-07-04 13:05:55 +01:00 |
|
Henry Oswald
|
77246b2a07
|
added query string support onto get requests for limit and before
|
2014-07-02 17:37:30 +01:00 |
|
Henry Oswald
|
8670b543b9
|
added basic chat handler
|
2014-07-02 17:28:05 +01:00 |
|
Henry Oswald
|
8f6dac77d0
|
added asset proxying from templates in, used for old images etc which people linked to
|
2014-07-01 16:00:42 +01:00 |
|
Henry Oswald
|
978e3262b5
|
added redirects from config file in, used for old template paths
|
2014-07-01 15:44:12 +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 |
|
Henry Oswald
|
17537b0d7a
|
client side js for templates loads and works
|
2014-07-01 14:27:20 +01:00 |
|
James Allen
|
be48ab2a30
|
Add in basic share modal
|
2014-07-01 14:12:28 +01:00 |
|
Henry Oswald
|
53fa15d3db
|
added basic error handling around templates rendering
|
2014-06-30 17:27:13 +01:00 |
|
Henry Oswald
|
27a97b7fa8
|
build titles for tempaltes page in web
|
2014-06-30 17:19:25 +01:00 |
|
Henry Oswald
|
b80f751cb2
|
templates works basically, needs error handling and few little improvments
|
2014-06-30 17:08:54 +01:00 |
|
James Allen
|
afb953a489
|
Display cursor name labels
|
2014-06-26 11:19:05 +01:00 |
|
James Allen
|
9dfbb36a83
|
Update project settings over http
|
2014-06-25 13:51:02 +01:00 |
|
James Allen
|
d214b5dc5e
|
Merge branch 'master' into master-redesign
|
2014-06-25 12:14:26 +01:00 |
|
James Allen
|
341570d85d
|
Be more verbose with ip debug output
|
2014-06-25 11:06:04 +01:00 |
|
James Allen
|
5aa7daa951
|
Fix password reset rate limit to work on ip, not email which changes every request
|
2014-06-25 10:46:58 +01:00 |
|
James Allen
|
cb682ac584
|
Add in more robust support for being behind a proxy
|
2014-06-25 10:34:23 +01:00 |
|
James Allen
|
d2ac9a1e9f
|
Add in auto complete
|
2014-06-24 21:09:20 +01:00 |
|
James Allen
|
f154f17704
|
Wire up fontSize and mode settings
|
2014-06-24 20:46:00 +01:00 |
|
James Allen
|
5cef41fdbd
|
Allow selecting of theme
|
2014-06-24 20:28:53 +01:00 |
|
James Allen
|
84ac77795f
|
Delete files
|
2014-06-22 20:49:58 +01:00 |
|
James Allen
|
242a866bce
|
Rename files
|
2014-06-22 20:08:56 +01:00 |
|
James Allen
|
f931df6084
|
Allow creation of folders
|
2014-06-22 14:39:38 +01:00 |
|
James Allen
|
f41534ee4d
|
Add in creating of files to editor
|
2014-06-22 12:10:42 +01:00 |
|
James Allen
|
6d0053e709
|
Start rebuilding editor
|
2014-06-21 22:20:37 +01:00 |
|
James Allen
|
e5ca033538
|
Add in configurable headings/footers
|
2014-06-20 21:35:42 +01:00 |
|
James Allen
|
a64b9eb82e
|
Create and style external pages
|
2014-06-20 17:17:24 +01:00 |
|
James Allen
|
a2bb89b579
|
Merge branch 'master' into master-redesign
|
2014-06-20 11:18:43 +01:00 |
|
James Allen
|
81845dec32
|
Wire up account settings forms
|
2014-06-20 11:15:25 +01:00 |
|
James Allen
|
0ef7e54ad3
|
Allow partial updates to user settings
|
2014-06-20 09:42:43 +01:00 |
|
James Allen
|
1bcc0a4554
|
Send 204 rather than redirect when leaving a project
|
2014-06-19 13:11:01 +01:00 |
|
Henry Oswald
|
85befe0d57
|
listen on stdout when unzipping, unsticks some zips for some reason...
|
2014-06-18 18:18:49 +01:00 |
|
James Allen
|
2b349039c3
|
Add in backend multiple project downloading
|
2014-06-18 16:37:18 +01:00 |
|
James Allen
|
b837a4e9f3
|
Merge branch 'master' into master-redesign
|
2014-06-18 15:26:09 +01:00 |
|
James Allen
|
70c51cb947
|
Merge branch 'master' into master-redesign
|
2014-06-18 10:56:30 +01:00 |
|
Henry Oswald
|
e0be5ef01b
|
added timeouts to email and newsletter as after a few days there are a few open connections still
|
2014-06-17 18:18:45 +01:00 |
|
James Allen
|
750b524771
|
Don't get user id from possibly deleted session
|
2014-06-17 17:45:07 +01:00 |
|
Henry Oswald
|
426b699865
|
links in emails use site url
|
2014-06-17 16:28:52 +01:00 |
|
James Allen
|
aa8969c652
|
Merge and fix external forms
|
2014-06-17 16:19:40 +01:00 |
|
James Allen
|
012371333f
|
Wrap project list code in require.js
|
2014-06-17 12:43:42 +01:00 |
|
Henry Oswald
|
2d55f080d6
|
get algolia to pull app id and api key from settings file
|
2014-06-17 12:25:49 +01:00 |
|
Henry Oswald
|
cc1b9472b2
|
don't show the user details area on project list if algolia instituions has not be setup
|
2014-06-17 11:59:57 +01:00 |
|
James Allen
|
c56648ab80
|
Merge branch 'master' into master-redesign
Conflicts:
app/views/project/list.jade
public/coffee/list.coffee
public/stylesheets/less/list.less
public/stylesheets/less/style.less
|
2014-06-17 11:54:29 +01:00 |
|
Henry Oswald
|
3350b99ccf
|
removed a couple of annoying console.log logs
|
2014-06-17 10:26:56 +01:00 |
|
James Allen
|
65a1f03768
|
Send project owner details to client
|
2014-06-16 13:34:38 +01:00 |
|
James Allen
|
9c5f63817e
|
Send accessLevel info to client
|
2014-06-16 12:47:39 +01:00 |
|
James Allen
|
6305ac16f4
|
Work in progress of doing project list with Angular
|
2014-06-12 15:22:49 +01:00 |
|
Henry Oswald
|
6dc1e54dc7
|
basic example using angular done
|
2014-06-11 17:45:09 +01:00 |
|
James Allen
|
067d343928
|
Display list of tags
|
2014-06-11 16:32:56 +01:00 |
|
Henry Oswald
|
e099a4a100
|
added default of empty string to user details, fixed route as well
|
2014-06-11 15:14:07 +01:00 |
|
James Allen
|
1eaba59df0
|
Use Ember to load project list
|
2014-06-11 14:52:23 +01:00 |
|
Henry Oswald
|
473da4fa4c
|
endpoint for user details is written
|
2014-06-11 12:46:28 +01:00 |
|
James Allen
|
99705ebb4f
|
Merge branch 'master' into master-redesign
|
2014-06-11 12:38:59 +01:00 |
|
Henry Oswald
|
3aff131428
|
added controller endpoint for updating user personal info
|
2014-06-10 22:26:43 +01:00 |
|
Henry Oswald
|
560288348a
|
moved delete project inside the editor to the http endpoint
|
2014-06-10 18:28:45 +01:00 |
|
Henry Oswald
|
dabed896be
|
lowercase password reset email
|
2014-06-10 17:54:29 +01:00 |
|
James Allen
|
d3221f1cf1
|
Style login and register forms
|
2014-06-09 10:19:02 +01:00 |
|
James Allen
|
b6217c401e
|
Merge branch 'master' into master-redesign
Conflicts:
public/stylesheets/less/trackchanges.less
|
2014-06-06 15:10:57 +01:00 |
|
James Allen
|
521befddd3
|
Merge pull request #76 from dfelder/patch-1
Ignore commented lines when setting root doc #52
|
2014-06-06 14:53:03 +01:00 |
|
James Allen
|
5c27ff4430
|
Don't show diffs of deleted docs (much simpler)
|
2014-06-06 14:43:45 +01:00 |
|
James Allen
|
02f48be825
|
Allow docs to be restored
|
2014-06-06 14:43:45 +01:00 |
|
James Allen
|
cabaf1ae1a
|
Show deleted documents when viewing history
|
2014-06-06 14:43:45 +01:00 |
|
Daniel Felder
|
1d12b88b09
|
Ignore commented lines when setting root doc #52
Same code I used in public/coffee/pdf/CompiledView.coffee. I didn't test it locally though.
|
2014-06-05 18:00:07 +02:00 |
|
Henry Oswald
|
22c467c231
|
Merge pull request #75 from dfelder/master
compile current file if top level document #42
|
2014-06-05 16:42:10 +01:00 |
|
James Allen
|
43684fda3a
|
Move to bootstrap 3 (site barely functional)
|
2014-06-04 16:14:35 +01:00 |
|
James Allen
|
2fb8620ba0
|
Allow deleting of projects forever
|
2014-06-04 12:45:04 +01:00 |
|
James Allen
|
b95c9e1d0a
|
Find file path and act on it one after the other to avoid race condition
|
2014-06-04 11:46:01 +01:00 |
|
James Allen
|
015fd6873f
|
Allow projects to be restore after being deleted
|
2014-06-03 17:35:44 +01:00 |
|
Daniel Felder
|
4320b790bd
|
adjusting unit tests
|
2014-06-01 19:26:33 +02:00 |
|
Daniel Felder
|
5ad0ca08f9
|
adjusting unit tests
|
2014-06-01 18:16:05 +02:00 |
|
Daniel Felder
|
f03b2df461
|
compile current file if top level document #42
|
2014-06-01 16:43:52 +02:00 |
|
James Allen
|
80c58bb718
|
Remove deprecated versioning code
|
2014-05-27 12:56:23 +01:00 |
|
James Allen
|
c1afbc66d9
|
Don't error if user is not logged in when compiling
|
2014-05-27 12:33:56 +01:00 |
|
James Allen
|
8f41c6dcb2
|
Don't automatically clear the cache
|
2014-05-21 15:20:25 +01:00 |
|
Henry Oswald
|
fd53cf0124
|
tell tpds sender to use pub url for docstore
|
2014-05-21 09:15:50 +01:00 |
|
James Allen
|
063f6c7680
|
Only auto clear CLSI cache on hard error, otherwise prompt user
|
2014-05-21 08:04:52 +01:00 |
|
Henry Oswald
|
57eb0e2006
|
Revert "Revert "changed docstore url to /raw for tpds updates""
This reverts commit 4af4ff34b0ebad0ce9056a1c1dd5e20f12f6096d.
|
2014-05-20 13:19:02 +01:00 |
|
Henry Oswald
|
ed9e25450a
|
Revert "Revert "change send doc lines using tpds to work with stream and doc store""
This reverts commit a41299570d07b83111b6a995902a30a67867a5c7.
|
2014-05-20 13:18:59 +01:00 |
|
James Allen
|
93d418b716
|
Revert "change send doc lines using tpds to work with stream and doc store"
This reverts commit ba37710b087b4919c01eed3d8cfeb9d61af43a4d.
|
2014-05-20 11:14:06 +01:00 |
|
James Allen
|
22c577f9b5
|
Revert "changed docstore url to /raw for tpds updates"
This reverts commit f9e60db892d270811c5e38f273d8a1b62b86eeb2.
|
2014-05-20 11:13:57 +01:00 |
|
Henry Oswald
|
2398b34f28
|
changed docstore url to /raw for tpds updates
|
2014-05-20 08:32:39 +01:00 |
|
Henry Oswald
|
d32fe588b7
|
change send doc lines using tpds to work with stream and doc store
|
2014-05-19 20:32:48 +01:00 |
|
James Allen
|
a45200dfe3
|
Automatically clear CLSI cache when compile fails
|
2014-05-19 16:10:52 +01:00 |
|