wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
35011 commits 157 branches 562 tags 714 MiB
Commit graph

35011 commits

This branch
This branch
All branches
Author SHA1 Message Date
Roeland Jago Douma
8a98d9b991
[3rdparty] Point to master again 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-10-18 21:44:51 +02:00
Morris Jobke
3c698c8c7c Merge pull request #1164 from nextcloud/avatar-files-accesscontrol-fixes 
Avatar/file-picker fixes for access-control app
 2016-10-18 20:26:53 +02:00
Morris Jobke
0c8bd9fa49 Merge pull request #1788 from nextcloud/share-link-whitespace 
add whitespace above share link so it's visually distinguished more
 2016-10-18 20:19:58 +02:00
Jan-Christoph Borchardt
9f2e370ed7 add whitespace above share link so it's visually distinguished more 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2016-10-18 19:43:18 +02:00
Lukas Reschke
b8eea5fcab Merge pull request #1729 from nextcloud/downstream-ldap-3 
[downstream] LDAP empty hardening
 2016-10-18 17:20:15 +02:00
Lukas Reschke
9759f55e50 Merge pull request #1771 from nextcloud/fix-issue-loading-checks-from-cache 
Do not reset the list after adding cached entries
 2016-10-18 17:18:33 +02:00
Lukas Reschke
c55a737b26 Merge pull request #1734 from nextcloud/setvalue_opt 
AllConfig setUserValue opt
 2016-10-18 17:16:25 +02:00
Lukas Reschke
0923d2665f Merge pull request #1742 from nextcloud/us_sync-date-of-death 
[oc] Sync deathdate and anniversary to birthday calendar
 2016-10-18 17:14:53 +02:00
Lukas Reschke
16b9c90b9a Merge pull request #1739 from nextcloud/bump_symfony_process 
[3rdparty] Bump synfony/process
 2016-10-18 17:13:51 +02:00
Morris Jobke
d366b0eff0 Merge pull request #1774 from nextcloud/ellipsize-sharee 
ellipsize sharee name to not overlap with can edit option on mobile
 2016-10-18 17:03:03 +02:00
Jan-Christoph Borchardt
10e53729cf Merge pull request #1780 from nextcloud/jquery-ui-fixes 
jquery UI fixes
 2016-10-18 16:37:45 +02:00
Joas Schilling
9c3e855812
The red box already makes clear it's an error 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-10-18 16:22:20 +02:00
Joas Schilling
656e3f7a24
Check the mimetype before reading the content and catch exception 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-10-18 16:22:20 +02:00
Morris Jobke
deb59d3d48 Merge pull request #1722 from nextcloud/hide-storage-warnings 
hide storage wrapper warning for the readonly storage
 2016-10-18 16:15:52 +02:00
Morris Jobke
4fbffe0f81 Merge pull request #1777 from nextcloud/user-mgmt-layout 
User management layout improvements
 2016-10-18 14:57:21 +02:00
Jan-Christoph Borchardt
76fd77d3b6 jquery UI fixes 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2016-10-18 14:56:00 +02:00
Morris Jobke
2bb031ecc6 Merge pull request #1606 from nextcloud/search-detail 
search design details
 2016-10-18 13:48:01 +02:00
Jan-Christoph Borchardt
19456713fa improve look of Add group flow 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2016-10-18 12:22:16 +02:00
Jan-Christoph Borchardt
86fd9ca9e0 fix list height and border to be as in Files 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2016-10-18 12:21:39 +02:00
Jan-Christoph Borchardt
22f76d96ad ellipsize sharee name to not overlap with 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2016-10-18 11:18:25 +02:00
Jan-Christoph Borchardt
129fdf2e2e Merge pull request #1754 from nextcloud/files-move 
Add file action to move files and folders
 2016-10-18 10:32:46 +02:00
Nextcloud bot
943d9737e4
[tx-robot] updated from transifex 2016-10-18 00:06:51 +00:00
Jan-Christoph Borchardt
2b79490201 use more fitting icon for files move action 2016-10-17 18:52:25 +02:00
Jan-Christoph Borchardt
cf5d30387b Merge pull request #1641 from nextcloud/log-in-button 
bring back dedicated log in button to make log in more usable
 2016-10-17 18:28:27 +02:00
Joas Schilling
4d6ec43402
Do not reset the list after adding cached entries 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-10-17 15:43:21 +02:00
Morris Jobke
6375790263 Merge pull request #1766 from nextcloud/force-uid-casing-on-transfer-ownership 
Make sure the UID is correctly cased
 2016-10-17 14:29:19 +02:00
Jan-Christoph Borchardt
aa4eaf3a7e finish up layout of log in page, postpone forgot password link for later 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2016-10-17 14:28:49 +02:00
Joas Schilling
c1b2d90ed8 Merge pull request #1761 from nextcloud/move_to_subfolder 
Move CONTRIBUTUNG and issue template into .github subfolder
 2016-10-17 13:43:29 +02:00
Joas Schilling
77a5491d9d
Make sure the UID is correctly cased 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-10-17 13:41:38 +02:00
Morris Jobke
96f8f209b9 Merge pull request #1449 from nextcloud/comments-user-mention 
Notifications for simple @-mentioning in comments
 2016-10-17 09:30:47 +02:00
Nextcloud bot
5b74b3ceaf
[tx-robot] updated from transifex 2016-10-17 00:06:55 +00:00
Arthur Schiwon
dade28cadd
Merge branch 'master' into downstream-ldap-3 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2016-10-16 14:42:16 +02:00
Marius Blüm
9ebd8d80ff
Move CONTRIBUTUNG and issue template into .github subfolder 
Signed-off-by: Marius Blüm <marius@lineone.io>
 2016-10-16 12:21:09 +02:00
Nextcloud bot
245a8f8fbc
[tx-robot] updated from transifex 2016-10-16 00:06:56 +00:00
Nextcloud bot
00ed841559
[tx-robot] updated from transifex 2016-10-15 00:06:56 +00:00
Morris Jobke
14981210e0 Merge pull request #1756 from nextcloud/filepicker 
Filepicker styling
 2016-10-14 18:40:38 +02:00
Robin Appelman
6d43942125
filepicker styling 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2016-10-14 17:36:08 +02:00
Robin Appelman
8d093e976a
use mimetype icons in filepicker if there is no preview 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2016-10-14 17:32:23 +02:00
Robin Appelman
fdc2e8ba56
Add file action to move files and folders 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2016-10-14 16:23:11 +02:00
Arthur Schiwon
70c7781aa8
apply some polish 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2016-10-14 15:36:05 +02:00
Lukas Reschke
62e19dfa80 Merge pull request #1441 from nextcloud/getby-id-less-queries 
optimize Folder::getById to use less queries
 2016-10-14 15:18:23 +02:00
Christoph Wurst
53eb0f7f42 Merge pull request #1037 from nextcloud/no-double-token-update 
dont update the auth token twice
 2016-10-14 14:53:17 +02:00
Morris Jobke
a38f3d9a9c Merge pull request #1745 from nextcloud/fix-dav-typo 
fix typo
 2016-10-14 12:40:43 +02:00
Thomas Citharel
3b055b160e
fix typo 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2016-10-14 11:48:18 +02:00
Thomas Müller
5cd90d4116
[9.2] Sync deathdate and anniversary to birthday calendar (#25655) 
* Sync deathdate and anniversary to birthday calendar (which should be renamed maybe)

* Sync deathdate and anniversary to birthday calendar (which should be renamed maybe)

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-10-14 10:12:43 +02:00
Roeland Jago Douma
dd7c267842
[3rdparty] Bump synfony/process 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-10-14 08:24:36 +02:00
Nextcloud bot
92c24a91fa
[tx-robot] updated from transifex 2016-10-14 00:07:00 +00:00
Roeland Jago Douma
6c5f7d586e
Fix migration tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-10-13 19:40:44 +02:00
Roeland Jago Douma
77272ea52d
Use cache to determine if value need to be updated 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-10-13 19:40:40 +02:00
Arthur Schiwon
a49d571799
fix and tidy up tests after merge conflicts 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2016-10-13 15:34:40 +02:00