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

15640 commits

Author SHA1 Message Date
Joas Schilling
a88edce54f Merge pull request #4130 from nextcloud/replace-useless-print-unescaped-with-p 
Replace unecessary unescaped prints with print
 2017-03-29 10:02:10 +02:00
Morris Jobke
ac7ca1c3a8 Merge pull request #4060 from nextcloud/shared_by_for_own_calendars 
fix bug with shared_by for own calendars if shared
 2017-03-29 00:29:54 -06:00
Nextcloud bot
58513255d2
[tx-robot] updated from transifex 2017-03-29 00:07:41 +00:00
Morris Jobke
9e1fdf4da5 Merge pull request #4126 from nextcloud/better-empty-content-in-the-sidebar 
Better styling of the empty content messages in the sidebar
 2017-03-28 17:50:10 -06:00
Lukas Reschke
99675b46e9
Replace unecessary unescaped prints with print 
There's no need to have those unescaped from what I can see.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-03-29 00:43:44 +02:00
Joas Schilling
b91bacf141
Better styling of the empty content messages in the sidebar 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-03-28 23:26:10 +02:00
Roeland Jago Douma
4821c00ea8 Merge pull request #4004 from nextcloud/backport-27172 
Remove SharedCache::getNumericStorageId to let CacheWrapper do it
 2017-03-28 21:56:44 +02:00
John Molakvoæ
f88a578f8e Merge pull request #4082 from nextcloud/fix-menu 
Fix pop over menu opacity
 2017-03-28 09:47:48 +02:00
Nextcloud bot
6309b9ec1d
[tx-robot] updated from transifex 2017-03-28 00:07:53 +00:00
Marius Blüm
0e058a9a94
Fix LDAP description 
Signed-off-by: Marius Blüm <marius@lineone.io>
 2017-03-27 16:30:29 +02:00
Robin Appelman
ae3016959e
fix shared storage numeric id 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-03-27 14:05:18 +02:00
Nextcloud bot
d9ebc2626f
[tx-robot] updated from transifex 2017-03-27 00:07:55 +00:00
Morris Jobke
e1ad305e0b
Fix pop over menu opacity 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-03-26 14:09:22 -06:00
Joas Schilling
0564392cb9
Fix the tests 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-03-26 21:26:45 +02:00
Joas Schilling
e0b040d623
Allow multiple navigation links from info.xml 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-03-26 21:15:25 +02:00
Joas Schilling
054e161eb5
Manage the right side menu via the navigation manager as well 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-03-26 19:40:41 +02:00
Joas Schilling
27e3a977aa
Fix unit test 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-03-26 10:59:59 +02:00
Morris Jobke
2249c77a06
Also remove failure notification if no update is available 
* error happened and vanished the notification should also
  vanish even if no update is available

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-03-26 10:59:58 +02:00
Joas Schilling
3668673d7b
Create a notification when the update server couldn't be reached for some days 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-03-26 10:59:58 +02:00
Nextcloud bot
0981f9a18a
[tx-robot] updated from transifex 2017-03-26 01:07:03 +00:00
Georg Ehrke
896dd76ab5
fix bug with shared_by for own calendars if shared 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2017-03-25 23:07:09 +01:00
Nextcloud bot
4ea79a5bbe
[tx-robot] updated from transifex 2017-03-25 01:07:45 +00:00
Lukas Reschke
4f73911bab Merge pull request #4041 from nextcloud/merge-systemtags-js 
Merge systemtags JS
 2017-03-24 21:12:42 +01:00
Lukas Reschke
3623431ac3 Merge pull request #4040 from nextcloud/merge-js-for-versions 
Merge JS for files_versions
 2017-03-24 21:11:58 +01:00
Morris Jobke
84b6b1807f Merge pull request #4038 from nextcloud/merge-js-for-fileview 
Merge file view JS files
 2017-03-24 13:17:06 -06:00
Lukas Reschke
a9c3692a9a
Merge systemtags JS 
Shaves off 7 requests.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-03-24 20:08:27 +01:00
Lukas Reschke
0ed56589cc
Merge JS for files_versions 
Shaves off 3 requests.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-03-24 19:57:19 +01:00
Lukas Reschke
bdd71b6081
Merge JS for comments 
Shaves off 6 requests.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-03-24 19:49:43 +01:00
Lukas Reschke
b70b138bdb
Merge file view JS files 
Removes 26 requests on the file list loading

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-03-24 19:42:22 +01:00
Lukas Reschke
2cd79a8d3d Merge pull request #3988 from nextcloud/jscombiner 
[PoC] JS Combiner
 2017-03-24 19:31:31 +01:00
Bjoern Schiessle
ee014bddbd
fix tests 
calling getAbsoluteBundlePath() in the constructor makes other tests fail

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-03-24 11:27:01 +01:00
Joas Schilling
33867f331c
Load cert file before syncing addressbooks and contacts 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-03-24 11:06:44 +01:00
Bjoern Schiessle
aa26a3ae74
use right format for avatars 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-03-24 11:06:44 +01:00
Bjoern Schiessle
e637113452
don't add empty values to the vcard 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-03-24 11:06:44 +01:00
Bjoern Schiessle
4531b4a81d
only execute code if exception was thrown by the corresponding controller 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-03-24 11:06:44 +01:00
Bjoern Schiessle
faf836b0c0
fix the way we create a new vcard to avoid to have multiple UIDs 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-03-24 11:06:41 +01:00
Roeland Jago Douma
48158c8bec
Combine additional files_sharing scripts 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-03-24 10:58:11 +01:00
Joas Schilling
35d3a082f2 Merge pull request #4010 from nextcloud/fac-58-mimetype-on-creating-directories 
Fix workflow engine mimetype detection when creating a directory
 2017-03-24 10:55:10 +01:00
Lukas Reschke
f94bc6f8bb Merge pull request #4013 from nextcloud/bundle_vendor_js 
Bundle vendor js
 2017-03-24 10:49:57 +01:00
Nextcloud bot
e18d928d9b
[tx-robot] updated from transifex 2017-03-24 01:08:00 +00:00
Morris Jobke
49d0507f5d Merge pull request #3879 from nextcloud/downstream-26915 
Added integration tests for sharees using v2.php
 2017-03-23 16:12:24 -06:00
Morris Jobke
71c80433c2 Merge pull request #4007 from nextcloud/backport-27155 
Change showTemporary notifications for closable ones
 2017-03-23 15:56:18 -06:00
Morris Jobke
a5a29ee27a Merge pull request #3953 from nextcloud/downstream-27027 
Ignore NoUserException for shares from ghosts
 2017-03-23 15:26:43 -06:00
Morris Jobke
d2654c8aea Merge pull request #3965 from nextcloud/downstream-27343 
Providing --path option to transfer-ownership
 2017-03-23 15:20:53 -06:00
Roeland Jago Douma
6e6cbae37c Merge pull request #3998 from nextcloud/backport-27032 
Use the expected method depending on the target being a file or folder
 2017-03-23 21:59:39 +01:00
noveens
40228c0c2b
added quit option in commentstabview.js 
added quit option in notif in app.js

added quit option in notif in file-upload.js

added quit option in notif in fileinfomodel.js

added quit option in notif in filelist.js

added quit option in notif in filelist.js

added quit option in notif in tagsplugin.js

added quit option in notif in statusmanager.js

added quit option in notif in external.js

added quit option in notif in versionstabview.js

added quit option in notif in notification.js

changes according to the latest review.

timeout removed since there is a button to close it

translation capability added

typo fixed

test files updated

small errors fixed

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-03-23 13:12:29 -06:00
Morris Jobke
869ba16273
do not remove the method and only keep the tests 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-03-23 13:10:43 -06:00
Lukas Reschke
9039b71a23 Merge pull request #4000 from nextcloud/backport-27216 
allow configuring authType for DAV backend
 2017-03-23 19:28:49 +01:00
Joas Schilling
3c1e7e5ada
Make deleting a group compatible with ocs v2 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-03-23 19:24:02 +01:00
Robin Appelman
a12ec5ec77
set cache to failedcache when shared storage init fails 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-03-23 15:01:23 +01:00