Commit graph

36223 commits

Author SHA1 Message Date
Morris Jobke
7ce5303374 Merge pull request #2496 from nextcloud/add-activities-for-favorite-managemet
Add an activity when managing favorites
2016-12-05 15:44:24 +01:00
Morris Jobke
1253d1008a Merge pull request #2411 from nextcloud/fix-encryption-home-storage
check if the file should really be encrypted before we update the file cache
2016-12-05 15:38:12 +01:00
Morris Jobke
86a53b4e19 Merge pull request #2501 from nextcloud/issue-2472-remove-update-notification-after-updating
Remove the update warning and the notification after an successful up…
2016-12-05 15:33:41 +01:00
Morris Jobke
b1b4de32b8 Merge pull request #2507 from nextcloud/conflict-dialog-ff
fix conflict dialog styling in firefox
2016-12-05 15:19:02 +01:00
Robin Appelman
af9b3e3889
fix conflict dialog styling in firefox
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-12-05 14:20:54 +01:00
Morris Jobke
8adf617726 Merge pull request #2468 from nextcloud/fix-personal-settings-readonly
personal settings: handle read-only parameters correctly
2016-12-05 12:15:04 +01:00
Morris Jobke
decce7ec8d Merge pull request #2502 from nextcloud/personal-settings-dead-code
remove dead js code from personal settings
2016-12-05 12:06:05 +01:00
Morris Jobke
5d301ed95d Merge pull request #2500 from nextcloud/issue-2326-personal-settings
Allow emtpy values on personal page and fix saving checkmark position
2016-12-05 12:05:26 +01:00
Joas Schilling
3a653b56ee
Remove the update warning and the notification after an successful update
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-12-05 10:50:28 +01:00
Christoph Wurst
46abd9e3d9
remove dead js code from personal settings
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2016-12-05 10:50:04 +01:00
Christoph Wurst
b19b788e7a
Allow emtpy values on personal page and fix saving checkmark position
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2016-12-05 10:48:52 +01:00
Bjoern Schiessle
9e66d5d7cf
hide password recovery note if email address can't be set
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-12-05 10:03:39 +01:00
Roeland Jago Douma
eeb81ec783 Merge pull request #2491 from nextcloud/fix-groups-enable-visual
Put "Enable only for specific groups" into a new div
2016-12-05 08:45:18 +01:00
Nextcloud bot
dda39728e3
[tx-robot] updated from transifex 2016-12-05 01:07:41 +00:00
John Molakvoæ (skjnldsv)
0d61707e25 Change groups enable to block element
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Signed-off-by: Felix A. Epp <work@felixepp.de>
2016-12-05 00:02:41 +01:00
John Molakvoæ
3234d4b36c Merge pull request #2497 from nextcloud/theming-icon-fixes
Fixing issues with themed icons
2016-12-04 16:09:12 +01:00
Julius Haertl
fd6670ae72
Fix transparency of icons
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2016-12-04 13:38:37 +01:00
Julius Haertl
f423bdcb81
Fix background border radius
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2016-12-04 13:38:36 +01:00
Julius Haertl
797e761492
Move sizing to renderAppIcon method
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2016-12-04 13:38:29 +01:00
Joas Schilling
1a802d3383
Add tests for favorite action
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-12-04 12:54:34 +01:00
Joas Schilling
7c1b288b57
Add some generic tests
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-12-04 12:41:14 +01:00
Joas Schilling
8baf986d3b
Add an activity when managing favorites
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-12-04 12:16:49 +01:00
Nextcloud bot
3bea7ac6ac
[tx-robot] updated from transifex 2016-12-04 01:07:30 +00:00
Roeland Jago Douma
e1baed632a Merge pull request #2493 from nextcloud/php7.1-final
Bump 7.1 CI to final!
2016-12-03 20:23:54 +01:00
Roeland Jago Douma
f6d4617b2c
Bump 7.1 CI to final!
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-12-03 19:44:37 +01:00
Morris Jobke
9eb1ea41ce Merge pull request #2428 from justin-sleep/upstream
Fix #2427 by converting $remember to integer
2016-12-03 11:10:22 +01:00
John Molakvoæ
cd2c17bf83 Merge pull request #2434 from nextcloud/app-list-grow
dont grow items in the app list
2016-12-03 09:20:39 +01:00
John Molakvoæ (skjnldsv)
f82a40d478
use flex and specify rows to align everything
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2016-12-03 08:34:11 +01:00
Nextcloud bot
181cf9c7f3
[tx-robot] updated from transifex 2016-12-03 01:07:26 +00:00
Lukas Reschke
1131338562 Merge pull request #2486 from nextcloud/shared-storage-mask
apply permissions mask for shared storage
2016-12-02 23:39:48 +01:00
Lukas Reschke
5a3a776af9 Merge pull request #2482 from nextcloud/fix-loading-icon-size
Fix loader size to 32px and 16px
2016-12-02 22:10:15 +01:00
justin-sleep
25a5c655f7 Move integer casting to the top of the chain
Signed-off-by: justin-sleep <justin@quarterfull.com>
2016-12-02 14:07:45 -06:00
Morris Jobke
2bc931dd10 Merge pull request #2437 from nextcloud/update-notification-icons
Use an icon for the update notifications
2016-12-02 20:05:50 +01:00
Morris Jobke
95243f49b6 Merge pull request #2490 from nextcloud/updated-gif-loader
Fix gif loader to fit css design, fix #1825
2016-12-02 20:03:35 +01:00
Roeland Jago Douma
0acf914dea Merge pull request #2480 from nextcloud/update-cache-success
only update the cache if the storage operation succeeds
2016-12-02 19:57:46 +01:00
John Molakvoæ
535655e23c Merge pull request #2483 from nextcloud/fix-unshare-icon-c
Fix share tab view
2016-12-02 19:49:32 +01:00
John Molakvoæ (skjnldsv)
890e25f7da
Fix gif loader to fit css design
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2016-12-02 19:38:31 +01:00
John Molakvoæ (skjnldsv)
14219c1082
Fix loader position and visibility
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2016-12-02 18:10:11 +01:00
John Molakvoæ (skjnldsv)
ef04bea5fb
Fix popover arrow
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2016-12-02 18:10:08 +01:00
Morris Jobke
717f1d380c Merge pull request #2475 from nextcloud/fix-filename-local-link
fix width of filename in sidebar to accommodate local link
2016-12-02 18:04:57 +01:00
Robin Appelman
1a379b0fdc
update test
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-12-02 18:04:21 +01:00
John Molakvoæ (skjnldsv)
b5392b8642
Fix loader size to 32px and 16px
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2016-12-02 18:04:03 +01:00
Morris Jobke
df12824a5b Merge pull request #2479 from nextcloud/icon-for-empty-versions
add icon if no versions are available
2016-12-02 18:03:50 +01:00
Robin Appelman
02ee4f958c
apply permissions mask for shared storage
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-12-02 17:59:02 +01:00
John Molakvoæ (skjnldsv)
8a12f0bc8f
Fix unshare delete icon
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2016-12-02 17:52:24 +01:00
Lukas Reschke
bd2a8e768e Merge pull request #2471 from nextcloud/harden_files_drop
Harden files drop
2016-12-02 17:43:04 +01:00
Robin Appelman
efbe26f9c3
only update the cache if the storage operation succeeds
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-12-02 16:20:49 +01:00
Morris Jobke
48dddf82eb
properly calculate the width of the name in the sidebar
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-12-02 16:08:41 +01:00
Morris Jobke
db56df1893 Merge pull request #2469 from nextcloud/fix-loading-icon-background
Remove white background from loading icon
2016-12-02 15:53:38 +01:00
Morris Jobke
865181d32a Merge pull request #2470 from nextcloud/fix-new-folder
Fix input field for new folder
2016-12-02 15:51:02 +01:00