CatalinScr
|
5fa20836cf
|
Modified Register and login button
|
2017-07-26 10:38:01 +03:00 |
|
CatalinScr
|
cab8716519
|
Changed the login button, repaired the hover menu and see more. Updated the logo
|
2017-07-25 01:08:53 +03:00 |
|
CatalinScr
|
796bf89491
|
Update of the front-page
|
2017-07-24 17:56:54 +03:00 |
|
Caleb James DeLisle
|
49c760131e
|
wip
|
2017-07-24 14:10:40 +02:00 |
|
Nicolas Lemoine
|
658b00814b
|
TodoApp - Style and translations
|
2017-07-23 16:08:49 +03:00 |
|
c4rl0sc
|
2e8e44933a
|
Fixed spelling error in Spanish translation
|
2017-07-23 14:31:12 +02:00 |
|
ansuz
|
dcf5719eaf
|
handle most of the boilerplate stuff
|
2017-07-23 14:27:47 +02:00 |
|
c4rl0sc
|
064e189495
|
Fixed spelling issues and improved translation quality.
|
2017-07-23 14:16:34 +02:00 |
|
Caleb James DeLisle
|
6a1ec54e2a
|
wip
|
2017-07-22 17:31:40 +02:00 |
|
Pierre Bondoerffer
|
dc9565f22f
|
make buttons colorful
|
2017-07-22 17:30:13 +02:00 |
|
Caleb James DeLisle
|
8404017af1
|
wip
|
2017-07-22 16:43:53 +02:00 |
|
ansuz
|
76e69f0ba8
|
Merge pull request #127 from gustavohmsilva/master
Merged translated and non-translated in pt-BR
|
2017-07-22 16:07:44 +02:00 |
|
ansuz
|
52fa77e961
|
Merge pull request #157 from MacLemon/reduce-image-asset-size
File size reduction and optimization of new image assets
|
2017-07-22 16:00:12 +02:00 |
|
Gustavo H M Silva
|
6785f166fd
|
Merge branch 'master' into master
|
2017-07-22 09:18:12 -03:00 |
|
ansuz
|
6622735db0
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-07-22 14:15:15 +02:00 |
|
ansuz
|
55cb0734e2
|
make bad state timeout configurable
|
2017-07-22 10:56:39 +02:00 |
|
MacLemon
|
25cba8bba3
|
Translated missing out.presentSuccess to german
|
2017-07-20 20:08:30 +02:00 |
|
MacLemon
|
29bfcfa719
|
File size reduction and optimization of new image assets
|
2017-07-20 20:03:26 +02:00 |
|
yflory
|
a80b00a765
|
Move the file picker in common
|
2017-07-20 18:32:03 +02:00 |
|
yflory
|
9633025afe
|
CSS for the removeHistory button in contacts
|
2017-07-20 17:26:33 +02:00 |
|
ansuz
|
b22127f10c
|
add history removal
|
2017-07-20 15:55:04 +02:00 |
|
Caleb James DeLisle
|
ffb5e555a0
|
Merge branch 'staging' into front-page
|
2017-07-20 10:09:32 +02:00 |
|
yflory
|
c33d2a2db0
|
New tooltips
|
2017-07-19 17:14:10 +02:00 |
|
yflory
|
82c87144cb
|
Remove the friend request button when the request is sent
|
2017-07-19 14:14:34 +02:00 |
|
yflory
|
1dc98dcff1
|
CSS for the contacts input field
|
2017-07-19 10:30:38 +02:00 |
|
yflory
|
26fa914982
|
Missing translation keys
|
2017-07-18 11:07:34 +02:00 |
|
Pierre Bondoerffer
|
a2c2e98060
|
Spanish update
|
2017-07-18 10:30:28 +02:00 |
|
yflory
|
6aab1c94b2
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-07-18 10:24:00 +02:00 |
|
yflory
|
baf439648e
|
Add the contacts app in the dropdown menu
|
2017-07-18 10:22:51 +02:00 |
|
ansuz
|
5716f76c91
|
fix typo in translations
|
2017-07-18 10:04:02 +02:00 |
|
yflory
|
743b87b70f
|
Add initial text in /contacts
|
2017-07-17 18:51:23 +02:00 |
|
yflory
|
aa8181ab2b
|
Contacts app translations
|
2017-07-17 18:34:46 +02:00 |
|
ansuz
|
0cd94e2ba8
|
add title to contacts app
|
2017-07-17 17:38:41 +02:00 |
|
ansuz
|
f2320190b8
|
change friends url to /contacts/
|
2017-07-17 17:18:28 +02:00 |
|
ansuz
|
06c971ec47
|
s/friend/contact/g
|
2017-07-17 15:52:13 +02:00 |
|
ansuz
|
2e0aa185cd
|
uppercase first letter of new translation keys
|
2017-07-17 14:12:05 +02:00 |
|
ansuz
|
6306de5265
|
set avatar border-radius to 4px
|
2017-07-17 13:43:51 +02:00 |
|
ansuz
|
33dcd2ae28
|
drop black border from avatars in userlist
|
2017-07-17 11:08:20 +02:00 |
|
ansuz
|
e2c17dbeb4
|
resolve conflicts
|
2017-07-13 17:52:00 +02:00 |
|
yflory
|
557f13f796
|
Unfriend and update username - beta
|
2017-07-13 17:32:57 +02:00 |
|
ansuz
|
7be1e249e1
|
add fa-share-alt to pad initialText
|
2017-07-13 15:48:03 +02:00 |
|
ansuz
|
96d2ff67e1
|
user-plus as icon for add-friend
|
2017-07-13 15:22:11 +02:00 |
|
ansuz
|
bf9c2b0b84
|
new messages
|
2017-07-13 12:29:49 +02:00 |
|
Caleb James DeLisle
|
f6abdc2b86
|
manual merge of staging
|
2017-07-13 10:30:42 +02:00 |
|
yflory
|
ac684a8dc7
|
Use the APP toolbar in profile
|
2017-07-12 18:34:16 +02:00 |
|
yflory
|
2d509e3e25
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-07-12 14:34:57 +02:00 |
|
yflory
|
b3e225cb3b
|
Replace spinner by text and fix mobile UI
|
2017-07-12 14:33:28 +02:00 |
|
ansuz
|
3453e54357
|
bump footer and package.json for upcoming version
|
2017-07-12 10:49:05 +02:00 |
|
yflory
|
42075e4b5f
|
Make everything 16px and 32px
|
2017-07-11 15:34:46 +02:00 |
|
yflory
|
16d0527e92
|
Add a page title in drive, settings and file
|
2017-07-11 15:13:39 +02:00 |
|
yflory
|
5d5f936682
|
Hide the upload table in code
|
2017-07-11 14:38:26 +02:00 |
|
yflory
|
a0b14faf89
|
Fix the font in settings and drive
|
2017-07-11 13:11:16 +02:00 |
|
yflory
|
112c4c85e5
|
Left menu in drive
|
2017-07-11 12:47:15 +02:00 |
|
yflory
|
59213a9c4e
|
Typo
|
2017-07-11 11:18:13 +02:00 |
|
yflory
|
560671ae7d
|
Make avatars circle
|
2017-07-10 18:46:26 +02:00 |
|
yflory
|
125018c8c3
|
New settings page
|
2017-07-10 18:29:23 +02:00 |
|
yflory
|
c02fa39524
|
Make drive search bar blue
|
2017-07-10 15:19:08 +02:00 |
|
yflory
|
0157e04b10
|
Fix overflowing content in the home page
|
2017-07-10 14:05:12 +02:00 |
|
yflory
|
e6188bfb63
|
Fix useradmin dropdown position
|
2017-07-10 12:38:54 +02:00 |
|
yflory
|
e8f3df5a46
|
Clean less
|
2017-07-10 11:57:04 +02:00 |
|
yflory
|
159d72f33b
|
Merge branch 'msg' into staging
|
2017-07-10 11:48:22 +02:00 |
|
yflory
|
8e2e8b1653
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-07-10 11:46:16 +02:00 |
|
yflory
|
ff10c282d4
|
Avatar in the user admin button
|
2017-07-10 11:46:06 +02:00 |
|
ansuz
|
52eb8e307c
|
feedback for language used
|
2017-07-10 10:59:32 +02:00 |
|
ansuz
|
086e5909dd
|
Merge branch 'soon' into staging
|
2017-07-10 10:43:41 +02:00 |
|
ansuz
|
4a37bc4a1c
|
abort the realtime session if it does not synchronize for 30 seconds
|
2017-07-10 10:34:25 +02:00 |
|
ansuz
|
c60a71e210
|
add connect button and view profile button
|
2017-07-10 09:23:58 +02:00 |
|
ansuz
|
6f7c60bf12
|
Merge pull request #154 from evalica/153
Issue #153: On Register, add spacing between checkboxes and labels
|
2017-07-07 17:17:30 +02:00 |
|
Ecaterina Moraru (Valica)
|
e8e8858e44
|
Issue #153: On Register, add spacing between checkboxes and labels
|
2017-07-07 17:26:34 +03:00 |
|
Ecaterina Moraru (Valica)
|
fc065a0484
|
Issue #151: Spacing between "Log-in" and "Register" buttons
- Removed ".first" class from Register button
- Increase spacing between buttons
|
2017-07-07 17:04:26 +03:00 |
|
yflory
|
a5e8f6ae81
|
Add friend app and fix avatar size
|
2017-07-06 18:00:03 +02:00 |
|
ansuz
|
f02285d103
|
fix lowercased p
|
2017-07-06 10:49:33 +02:00 |
|
Pierre Bondoerffer
|
56ed1dd457
|
spanish update
|
2017-07-06 10:13:56 +02:00 |
|
ansuz
|
4016a95540
|
prototype invite app
|
2017-07-05 16:01:50 +02:00 |
|
yflory
|
bf17ad3f1e
|
Friend button in the userlist
|
2017-07-05 15:59:36 +02:00 |
|
yflory
|
d7f9ddd8d2
|
Fix icon colors in the new menu (/pad app)
|
2017-07-04 15:57:34 +02:00 |
|
yflory
|
cc67838786
|
Fix horizontal scrollbar in /pad anonymous mode
|
2017-07-04 15:56:18 +02:00 |
|
ansuz
|
fa06f9d413
|
fix minor bugs in poll
|
2017-07-04 15:09:09 +02:00 |
|
ansuz
|
43d4597f38
|
merge to master
|
2017-07-04 14:19:08 +02:00 |
|
Caleb James DeLisle
|
25905d13fa
|
wip
|
2017-07-03 20:40:19 +02:00 |
|
yflory
|
47c6c64b8a
|
Allow emojis in default avatars
|
2017-07-03 18:37:50 +02:00 |
|
yflory
|
ffd184d50e
|
Fix overflowing names in the new userlist
|
2017-07-03 17:41:34 +02:00 |
|
yflory
|
1a27f11e73
|
Fix dropdown menus in static pages
|
2017-07-03 17:04:59 +02:00 |
|
yflory
|
fa2d857d70
|
Fix css issues with Safari
|
2017-07-03 16:11:41 +02:00 |
|
yflory
|
81c8949aee
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-07-03 14:43:17 +02:00 |
|
yflory
|
1df5e6e855
|
Fix toolbar buttons for Safari
|
2017-07-03 14:32:54 +02:00 |
|
ansuz
|
bf414c15ee
|
fix logout button on home page
|
2017-07-03 12:26:08 +02:00 |
|
yflory
|
70c9f3df75
|
Fix avatar size
|
2017-07-03 12:13:37 +02:00 |
|
Caleb James DeLisle
|
fcff5fa009
|
wip
|
2017-07-02 16:51:21 +02:00 |
|
yflory
|
335898a4c7
|
Hack the drawer to close it when clicking outside
|
2017-06-30 18:23:23 +02:00 |
|
yflory
|
472a62730b
|
Fix profile creation and add a link to the profile app
|
2017-06-30 17:24:22 +02:00 |
|
yflory
|
f357ec32c2
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-06-30 16:57:37 +02:00 |
|
yflory
|
b153dda6ff
|
Add avatars in the user list
|
2017-06-30 16:57:23 +02:00 |
|
ansuz
|
c2e153e8ed
|
more fouc fixes
|
2017-06-30 16:20:10 +02:00 |
|
ansuz
|
8ffad5ece6
|
FOUC fixes
|
2017-06-30 16:10:42 +02:00 |
|
yflory
|
b6944e6638
|
Fix userlist style in apps without iframe
|
2017-06-30 13:13:11 +02:00 |
|
yflory
|
555d0a09f8
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-06-30 12:36:34 +02:00 |
|
yflory
|
568ce70afd
|
Add a spinner for the history and update history buttons
|
2017-06-30 12:36:21 +02:00 |
|
Caleb James DeLisle
|
2144587919
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-06-30 12:11:55 +02:00 |
|
Caleb James DeLisle
|
c25f2df721
|
Added caching versions to some of the images which are loaded by js
|
2017-06-30 12:11:44 +02:00 |
|
yflory
|
b9320e6005
|
Toolbar improvements
|
2017-06-30 11:42:54 +02:00 |
|
ansuz
|
b7cb1a8d5f
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-06-29 17:54:29 +02:00 |
|
yflory
|
8279ef3130
|
Fix conflict between ckeditor toolbar and userlist on small screens
|
2017-06-29 17:51:30 +02:00 |
|
ansuz
|
0b9d7d6c0b
|
fix color of links in poll and whiteboard
|
2017-06-29 16:51:44 +02:00 |
|
yflory
|
56a25e1036
|
Small fixes for the new toolbar
|
2017-06-29 15:15:40 +02:00 |
|
ansuz
|
c53ebe3598
|
bring upload status container to the front
|
2017-06-28 16:33:00 +02:00 |
|
ansuz
|
5e56ad912e
|
remove the last bit of compiled css
|
2017-06-28 14:51:49 +02:00 |
|
ansuz
|
7de2683169
|
make all apps use clientside templates
|
2017-06-27 18:17:52 +02:00 |
|
ansuz
|
bdca6b10c2
|
use templates in poll.js
|
2017-06-27 15:38:12 +02:00 |
|
ansuz
|
3a9b480e4e
|
resolve merge conflicts in template.js
|
2017-06-27 14:28:28 +02:00 |
|
yflory
|
40f4fc2682
|
Add the profile app in template.js
|
2017-06-27 14:27:54 +02:00 |
|
ansuz
|
9b6790534f
|
remove grey text from ckeditor initialState
|
2017-06-27 14:26:09 +02:00 |
|
ansuz
|
e9bfaa9a60
|
compile less clientside. remove compiled css
|
2017-06-27 14:25:02 +02:00 |
|
yflory
|
c431041e3f
|
Fix position of the rightside drawer with small screen
|
2017-06-26 15:53:29 +02:00 |
|
yflory
|
36ef4178dc
|
Remove the editable title from the file app
|
2017-06-26 15:16:17 +02:00 |
|
yflory
|
c364803406
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-06-26 11:25:06 +02:00 |
|
yflory
|
805e604e53
|
Add missing icons
|
2017-06-26 11:24:49 +02:00 |
|
ansuz
|
f181e8db60
|
correct parentheses
|
2017-06-26 10:45:27 +02:00 |
|
MacLemon
|
f4fdb7040c
|
Optimize image assets to speedup page loading
|
2017-06-25 20:14:23 +02:00 |
|
Gustavo H M Silva
|
6af4335ead
|
Translated up to page 317
Translated up to page 317
|
2017-06-23 14:28:00 -03:00 |
|
yflory
|
ce44a8d351
|
Fix the backup button in anonymous drive
|
2017-06-23 18:02:36 +02:00 |
|
yflory
|
06a0590f73
|
New folder icons
|
2017-06-23 17:58:41 +02:00 |
|
yflory
|
0d4d104e08
|
Mobile support for the new toolbar
|
2017-06-23 17:56:14 +02:00 |
|
yflory
|
5a48cba999
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-06-22 16:15:08 +02:00 |
|
yflory
|
684269fdda
|
Userlist in polls
|
2017-06-22 16:14:54 +02:00 |
|
ansuz
|
bd1db735dd
|
jshint compliance
|
2017-06-22 16:02:20 +02:00 |
|
ansuz
|
35bfa1dce4
|
test client-side templates in whiteboard app
|
2017-06-22 16:01:33 +02:00 |
|
yflory
|
a11befaa0f
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-06-22 15:52:31 +02:00 |
|
yflory
|
13288ee18b
|
Update the userlist in code, slide and pad
|
2017-06-22 15:52:25 +02:00 |
|
yflory
|
dcfc59c2e2
|
Translation key updated
|
2017-06-22 11:21:37 +02:00 |
|
yflory
|
92b6e60573
|
Small improvements for the new toolbar
|
2017-06-22 11:13:53 +02:00 |
|
ansuz
|
eddfb936f2
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-06-22 11:12:51 +02:00 |
|
ansuz
|
115813c191
|
Merge branch 'new-templates' into staging
|
2017-06-22 11:11:32 +02:00 |
|
ansuz
|
3657e978fd
|
give main2.js a more sensible name
|
2017-06-22 11:06:11 +02:00 |
|
ansuz
|
e86ef209a8
|
define loading screen markup in js
|
2017-06-22 11:04:21 +02:00 |
|
ansuz
|
118b83c420
|
make register and login user clientside templates
|
2017-06-22 10:04:46 +02:00 |
|
Gogs
|
6dacbf2bd9
|
add translations and some improvements
|
2017-06-21 21:38:56 +02:00 |
|
yflory
|
8d956c3de6
|
New toolbar
|
2017-06-21 18:04:35 +02:00 |
|
ansuz
|
48f9745619
|
clientside templating
|
2017-06-21 18:02:38 +02:00 |
|
yflory
|
b7a0547b77
|
New toolbar colors
|
2017-06-20 17:59:11 +02:00 |
|
yflory
|
59fb5bd8be
|
One toolbar color per app
|
2017-06-20 12:33:50 +02:00 |
|
yflory
|
5a248db267
|
Merge branch 'staging' into newCk
|
2017-06-20 10:57:40 +02:00 |
|
yflory
|
f13d23241c
|
Upgrade CkEditor to version 4.7
|
2017-06-20 10:03:13 +02:00 |
|
ansuz
|
9be23be5eb
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-06-19 18:09:57 +02:00 |
|
ansuz
|
b80d7513aa
|
skip over the terms of service link
|
2017-06-19 18:03:39 +02:00 |
|
yflory
|
1275f3f3a3
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-06-19 17:59:18 +02:00 |
|
yflory
|
f5da7ae42e
|
Add a new loading tip in french
|
2017-06-19 17:59:12 +02:00 |
|
ansuz
|
e2ff88e4c4
|
tooltips for file upload
|
2017-06-19 17:56:19 +02:00 |
|
Pierre Bondoerffer
|
726302a9ee
|
Spanish update
|
2017-06-19 15:05:17 +02:00 |
|
ansuz
|
3f85471ab3
|
update footer and package.json for upcoming version
|
2017-06-15 16:13:33 +02:00 |