mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
35,292 Commits 349 Branches 696 Tags 1.6 GiB
Commit Graph

35292 Commits

Author SHA1 Message Date
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
Morris Jobke 4d2835802f
hide storage wrapper warning for the readonly storage 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2016-10-13 14:37:31 +02:00
Roeland Jago Douma 8c760e9187 Merge pull request #1721 from nextcloud/fix_bower 
Add .bower.json to version control
 2016-10-13 12:58:51 +02:00
Roeland Jago Douma cea0826796 Merge pull request #1720 from nextcloud/3rdparty_master 
[3rdparty] Point to master again
 2016-10-13 12:38:27 +02:00
Lukas Reschke f590bb1b3a Merge pull request #1701 from nextcloud/impr-user-list 
tidy up adding user to list a little bit
 2016-10-13 12:23:12 +02:00
Morris Jobke 05869e4d22 Merge pull request #1726 from nextcloud/fix-symfony-table 
symfony replaced table helper by class, fixes two broken LDAP occ com…
 2016-10-13 12:19:15 +02:00
Nextcloud bot 9aae4a0d02
[tx-robot] updated from transifex 2016-10-13 00:07:02 +00:00
Victor Dubiniuk c4fcd1f282
Update tests for phunit 5.5 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2016-10-13 01:06:45 +02:00
Victor Dubiniuk 011d5f554c
Harden empty 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2016-10-13 00:53:34 +02:00
Arthur Schiwon 9e817e9e0b
symfony replaced table helper by class, fixes two broken LDAP occ commands 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2016-10-12 23:47:07 +02:00
Arthur Schiwon 1bcd2ca8e3
emit pre-update event for comments 
* notifications can be cleaned up, no polluted DB
* updating comments will re-notify users or remove notifications, depending on the message

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2016-10-12 18:06:22 +02:00
Robin Appelman 2de59d8a2a
remove unneeded unlock 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2016-10-12 16:12:40 +02:00
Robin Appelman 1484d01ff6
explicitly cast to int 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2016-10-12 16:12:39 +02:00
Robin Appelman ab10a54836
remove duplicate trait 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2016-10-12 16:12:38 +02:00
Robin Appelman f63f0aa1ae
get node by path as fallback 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2016-10-12 16:12:37 +02:00
Robin Appelman 9754724c8b
fix getting recipient share in ocs api 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2016-10-12 16:12:37 +02:00
Robin Appelman 240538d9e6
reuse share node when creating a share 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2016-10-12 16:12:36 +02:00
Robin Appelman 7d1e800c15
fix share tests not passing path 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2016-10-12 16:12:36 +02:00
Robin Appelman 1b3b816a0a
re-use the share node while formating if we already have it 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2016-10-12 16:12:35 +02:00
Robin Appelman 3845d4ec9a
more robust test setup 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2016-10-12 16:12:34 +02:00
Robin Appelman 7ce68ce6ac
phpunit is weird 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2016-10-12 16:12:34 +02:00