Henry Oswald
3bac4dc39f
increase auto compile limit
2014-10-14 11:50:06 +01:00
Henry Oswald
6437f74cd3
use req.ip not x-forwarded-for to get ip address for multi currency
2014-10-13 17:55:18 +01:00
Henry Oswald
5a0d74753f
plans page will auto redirect to best guess currency
2014-10-13 17:39:44 +01:00
Henry Oswald
2bf34bba4d
added currency to subscription view model
2014-10-13 16:14:13 +01:00
James Allen
3c058edfb4
Add github feature flag to user model
2014-10-13 15:45:19 +01:00
Henry Oswald
7964616f02
changing email address should lowercase the email
2014-10-13 15:44:45 +01:00
James Allen
5edefe2498
Add in compile timeout and group feature options
2014-10-13 15:42:11 +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
3ca04e25fd
add 1 second timeout to geoiplookup
...
response times generally seem to be around 0.05s from our servers
2014-10-13 13:15:48 +01:00
Henry Oswald
2e6c2c1926
default to USD in geo ip lookup.
...
Decided to put default logic in the GeoIpLookup.getCurrencyCode as
we are going to want this default everywhere we use it.
2014-10-13 13:08:11 +01:00
Henry Oswald
e78e4d46b0
use first ip passed though in string for ip lookup
2014-10-13 13:04:20 +01:00
Henry Oswald
259871cbdd
added geoip lookup feature
2014-10-13 00:45:45 +01:00
Henry Oswald
40c3c3e1ce
added customAccount to subscription model
2014-10-10 15:57:27 +01:00
Henry Oswald
b90003b11e
added custom user dashboard page
2014-10-10 15:44:53 +01:00
Henry Oswald
3ba3a91043
if its a custom account redirect to /user/subscription/custom_account
2014-10-10 15:11:22 +01:00
Henry Oswald
e5ab40c911
added example session invalidation code
2014-10-09 18:10:01 +01:00
Henry Oswald
e7984a90d7
unlink dropbox when a user cancels
2014-10-09 17:05:41 +01:00
Henry Oswald
9924882b59
Merge branch 'master' of https://github.com/sharelatex/web-sharelatex
2014-10-09 16:45:26 +01:00
James Allen
4743b460f5
Only show rename or deleted message once
2014-10-09 09:13:38 +01:00
James Allen
accd8207b2
Show password reset expired message rather than server error if that's what has happened
2014-10-08 17:18:24 +01:00
Henry Oswald
c2c29bb282
university site renders via prozy ok
2014-10-08 16:07:44 +01:00
James Allen
82dc3cf654
Don't reload module views each request by default
2014-10-08 12:39:36 +01:00
James Allen
128c672edd
Merge branch 'github-sync'
...
Conflicts:
package.json
2014-10-08 12:13:37 +01:00
James Allen
dbd85a05f1
Send user features and features switches to views where needed
2014-10-07 13:31:13 +01:00
Henry Oswald
8789a4bde1
server rejects rename of entitys over 150 chars
2014-10-07 11:16:26 +01:00
Henry Oswald
b01b05e49b
server rejects project names over 150 chars
2014-10-07 11:14:02 +01:00
James Allen
6c7c09075c
Treat paths properly in project content update methods
2014-10-03 11:33:18 +01:00
James Allen
10732d112d
Hook module system into project list page
2014-10-03 11:32:59 +01:00
James Allen
13a96c925b
Add in endpoints to allow updating project files when the project id is know
2014-10-02 14:15:30 +01:00
Henry Oswald
81307324fc
v2, seems to work...
2014-09-26 17:04:33 +01:00
Henry Oswald
f73629f8d9
v1 of sentinal support
2014-09-26 14:52:00 +01:00
Henry Oswald
2376d0a188
added generic error logging
2014-09-18 14:37:23 +01:00
Henry Oswald
9c98e95ca4
send cancelation email after 1 hour
2014-09-16 14:25:12 +01:00
Henry Oswald
6efda9cf1c
push currency default to seperate var
2014-09-11 11:45:00 +01:00
Henry Oswald
20f0c648e5
default to USD
2014-09-11 11:35:39 +01:00
Henry Oswald
1b02dc72a3
destroy session on dropbox webhook
2014-09-10 14:19:44 +01:00
Henry Oswald
c08a568664
removed session logging
2014-09-10 10:09:25 +01:00
Henry Oswald
d961b48857
imporved logging for session debug
2014-09-10 08:20:36 +01:00
Henry Oswald
ca402a3061
added some logging in for sessions
2014-09-08 17:45:37 +01:00
James Allen
db9632f8f2
Allow modules to inject parts of views
2014-09-08 15:40:46 +01:00
James Allen
374c0f3d65
Add existence check for modules dir
2014-09-08 14:23:47 +01:00
James Allen
becb294c5c
Create basic module loading system
2014-09-08 14:19:24 +01:00
Henry Oswald
93b4c5f4f8
thank you page displays the correct currency
2014-09-08 10:59:12 +01:00
Henry Oswald
aee0dda243
added currency to signiture
2014-09-08 10:36:30 +01:00
Henry Oswald
eeb27062a0
added currency query string param to subscribe button
2014-09-05 11:40:14 +01:00
Henry Oswald
8762297158
touch the session rather than setting the expires, same result
2014-09-04 18:07:31 +01:00
James Allen
971afb7342
Treat large text files as binary
2014-09-04 13:00:51 +01:00
Henry Oswald
e740e4913d
if user is already annual tell them so on the annual upgrade page
2014-08-29 14:13:05 +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
27b9cad8ca
make ga experiements per page
2014-08-24 17:07:40 +01:00
James Allen
894024ba29
Don't allow folders to be moved into their child folders
2014-08-22 14:38:52 +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
c8ab1bd394
Merge branch 'master' of github.com:sharelatex/web-sharelatex
2014-08-22 12:52:31 +01:00
James Allen
dc5e1f71bd
Remove console.log debug line
2014-08-22 12:52:27 +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
4a19d6731a
Merge branch 'master' of https://github.com/sharelatex/web-sharelatex
2014-08-21 13:03:54 +01:00
Henry Oswald
9bcf979e8a
changed title for restricted to use translations key
2014-08-21 13:03:51 +01:00
Henry Oswald
b9372e6dcd
added key for your projects
2014-08-21 13:02:28 +01:00
James Allen
f093c99b96
Remove deprecated background dropbox polling logic
2014-08-21 13:01:27 +01:00
Henry Oswald
04e50f8ba6
changed cookie name from hard coded to be config option, defaults to sharelatex.sid
2014-08-20 18:01:21 +01:00
James Allen
d0eee7a1e5
Refactor template settings
2014-08-20 14:47:27 +01:00
Henry Oswald
ca5b1e7422
cleaned up smoke tests
2014-08-19 14:35:20 +01:00
Henry Oswald
83d8c48dc6
Merge branch 'master' of https://github.com/sharelatex/web-sharelatex
2014-08-19 11:20:06 +01:00
Henry Oswald
523694c4ff
changed smoke tests to work with curl
...
this was needed as there is a bug with request/tough cookie with
multi subdomain cookies ie .sharelatex.com
https://github.com/goinstant/tough-cookie/issues/16
moving it to request in the future is probably a good idea, if we do move to
request then with the current issues we would we need to set
jar._jar.rejectPublicSuffixes = false
2014-08-19 11:17:51 +01:00
Henrique Dias
e0e9949da5
dynamic template menu by config settings
2014-08-18 14:26:47 -03:00
Henry Oswald
aa4f748608
Merge branch 'master' into i18n
2014-08-14 15:42:54 +01:00
James Allen
9be7228247
Delay Dropbox polling by 5 seconds and dispatch only a single request
2014-08-14 13:48:23 +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
604505131b
Convert integer dropbox id to string when searching mongo
2014-08-13 17:34:45 +01:00
James Allen
670e8e5cb9
Use Dropbox Real-time polling
2014-08-13 17:26:18 +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
3348249dcd
Download template PDF and zip file with good file names
2014-08-12 12:02:09 +01:00
James Allen
b7ed3bab8f
Merge branch 'redis-queue'
2014-08-11 12:10:25 +01:00
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
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
James Allen
0a44aa9e71
Push into doc updater queue rather than pub/sub for updates
2014-08-07 13:19:10 +01:00
Henry Oswald
673def4f90
added different lang links to head for google
2014-08-06 15:05:13 +01:00
James Allen
a7cf8d6b0a
Sort out title of wiki
2014-08-05 17:08:38 +01:00
Henry Oswald
377acfaa56
added default lang of en-US and translations package does the set lang based on subdomain
2014-08-05 11:15:17 +01:00
Henry Oswald
2be22d7ca7
cookies work accross different subdomains, added translations middlewear into stack to render based on domain
2014-08-04 16:47:14 +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
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