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

14592 Commits

Author SHA1 Message Date
Jan-Christoph Borchardt 5d7e9bb8fc Merge pull request #1768 from nextcloud/more-filepicker 
More filepicker improvements
 2016-10-20 14:46:57 +02:00
Morris Jobke 195c53b7a6 Merge pull request #1797 from nextcloud/issue-1791-show-path-on-filename-conflict 
Show the path, when the filename conflicts
 2016-10-20 00:27:54 +02:00
Robin Appelman 67050fd463
fix file exist dialog styling 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2016-10-19 14:18:21 +02:00
Roeland Jago Douma b5599a7673 Merge pull request #1795 from nextcloud/systemtags-activity-wording 
change wording of system tags from un/assigned to more human added/removed
 2016-10-19 12:16:46 +02:00
Joas Schilling 6f2fe8c62a
Show the path, when the filename conflicts 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-10-19 11:33:25 +02:00
Morris Jobke e072057dd8 Merge pull request #1740 from nextcloud/issue-1707-big-files-on-32-bits 
Make sure we only use numbers as length
 2016-10-19 11:01:19 +02:00
Jan-Christoph Borchardt 89dd5103cf change wording of system tags from un/assigned to more human added/removed 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2016-10-19 10:50:20 +02:00
Joas Schilling 5e48ce98c7 Merge pull request #1784 from nextcloud/fix-activity-filter-names 
Adjust wording to make the separation between sharing and files more clear
 2016-10-19 09:45:30 +02:00
Joas Schilling 05223a39f9
Make sure we only use numbers as length 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-10-19 09:28:54 +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
Joas Schilling b112493d1a
Adjust wording to make the separation between sharing and files clearer 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-10-18 17:18:14 +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
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
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 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
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
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
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
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
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
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
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 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 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 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