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

31526 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jan-Christoph Borchardt
be9b685926 Merge pull request #23444 from owncloud/add-loading-spinner 
Add loading spinner to "Add to owncloud"
 2016-04-07 13:52:34 +02:00
Joas Schilling
0de15a86f0 Merge pull request #23773 from owncloud/share_move_delete_user_hook 
Migrate post_userDelete hook to share manager
 2016-04-07 13:01:10 +02:00
Thomas Müller
a5a48ae65c Move some translation stings around to enable xgettext to detect them 2016-04-07 12:59:59 +02:00
Thomas Müller
f5c5f45572 Also use Javascript as language in l10n.pl - fixes #13924 2016-04-07 12:59:59 +02:00
Thomas Müller
8932ec64a5 Merge pull request #23833 from owncloud/remove-xxx 
Remove xxx from ownCloud we dont want to see that 🙈
 2016-04-07 12:53:29 +02:00
Joas Schilling
bba28590b7
Remove xxx from ownCloud we dont want to see that 🙈 2016-04-07 12:18:44 +02:00
Erik Pellikka
73d5889c5d add loading spinner to add to owncloud input field 
Update public.js

Update public.js
 2016-04-07 04:33:46 -04:00
Robin Appelman
cdedda99e4 Make lock ttl configurable 2016-04-07 08:24:13 +02:00
Jenkins for ownCloud
1576a9a10b [tx-robot] updated from transifex 2016-04-07 01:56:01 -04:00
John Molakvoæ
fade4796e7 Merge pull request #23768 from owncloud/skjnldsv-color-generator-edit 
Updated color generator
 2016-04-07 05:03:38 +02:00
John Molakvoæ
28571e6361 Updated color generator 
Separated the main function to allow special use without dom manipulation.
 2016-04-06 19:34:50 +02:00
Lukas Reschke
9b930cd01d Merge pull request #23766 from owncloud/replace-getid-3 
Replace getid3 with ID3Parser
 2016-04-06 18:32:18 +02:00
Thomas Müller
90c853614d Merge pull request #23822 from stweil/master 
tests: Fix typos (found by codespell)
 2016-04-06 15:11:51 +02:00
Stefan Weil
02e226a6b3 tests: Fix typos (found by codespell) 
Fix also a small grammar issue.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
 2016-04-06 15:08:27 +02:00
Thomas Müller
dda739c0cc Merge pull request #23501 from owncloud/alarms_for_birthdayevents 
add VALARM for birthday events
 2016-04-06 14:31:07 +02:00
Thomas Müller
56ab04f11e Merge pull request #23823 from owncloud/drop-js-based-acceptance-tests 
Drop JS based acceptance tests - we have our behat based integration …
 2016-04-06 14:17:08 +02:00
Roeland Douma
93b1768eb7 Merge pull request #23819 from owncloud/move-core-completely-to-psr4 
Move OC/Core completely to PSR-4
 2016-04-06 13:31:44 +02:00
Roeland Douma
7ed271b168 Merge pull request #23820 from owncloud/move-settings-completely-to-psr4 
Move OC/Settings completely to PSR-4
 2016-04-06 13:31:05 +02:00
Lukas Reschke
e2ea289943 Merge pull request #23777 from owncloud/ldap-null-user 
Handle case where the user is not known
 2016-04-06 12:58:08 +02:00
Jenkins for ownCloud
de122a9b04 [tx-robot] updated from transifex 2016-04-06 06:47:12 -04:00
Thomas Müller
e515061ee7 Drop JS based acceptance tests - we have our behat based integration tests which are activly maintained 2016-04-06 12:28:23 +02:00
Lukas Reschke
cc5a2b549e
Replace getid3 with ID3Parser 2016-04-06 12:00:16 +02:00
Joas Schilling
f37c3093a0 Merge pull request #23818 from owncloud/use-proper-methods 
Use proper shortcut methods in templates
 2016-04-06 11:59:17 +02:00
Lukas Reschke
5a0c936f99
Remove OC/Settings from old autoloader 2016-04-06 11:34:53 +02:00
Lukas Reschke
c952adabb5
Remove OC/Core autoloading from old autoloader 2016-04-06 11:34:29 +02:00
Lukas Reschke
c12bb839e1
Rename files to be PSR-4 compliant 2016-04-06 11:12:22 +02:00
Lukas Reschke
a4b19a5b1e
Rename files to be PSR-4 compliant 2016-04-06 11:00:52 +02:00
Morris Jobke
22898fa107 Use proper shortcut methods in templates 2016-04-06 10:25:04 +02:00
Morris Jobke
046506dd14 Merge pull request #23763 from owncloud/do_not_export_share_type_2 
Share type 2 is private
 2016-04-06 09:40:13 +02:00
Thomas Müller
01b26d78a0 Merge pull request #23793 from owncloud/hard-code-dav-endpoints 
All webdav endpoints within remote.php are now hardcoded - helps to p…
 2016-04-06 08:34:37 +02:00
Roeland Douma
d739af3d4a Merge pull request #23808 from owncloud/test-lock-with-strange-filename 
Test locking with strange filename
 2016-04-06 08:23:14 +02:00
Jenkins for ownCloud
fb8c8ef38b [tx-robot] updated from transifex 2016-04-06 01:56:24 -04:00
Thomas Müller
1bb40b866a Merge pull request #23811 from owncloud/move-settings-and-oc-core-to-composer 
Add OC\Core and OC\Settings to composer autoloader
 2016-04-05 17:58:07 +02:00
Thomas Müller
60f532882c Merge pull request #23794 from owncloud/handle-null-in-usermanager 
Prevent null to be passed into the closure of callForAllUsers
 2016-04-05 17:57:39 +02:00
Lukas Reschke
433c0160b6 Move OC\Core and OC\Settings to composer autoloader 2016-04-05 16:47:38 +02:00
Jörn Friedrich Dreyer
4445ef82e0 Test locking with strange filename 2016-04-05 16:13:28 +02:00
Thomas Müller
90335ee2a1 Merge pull request #23040 from owncloud/mobile-css-loading 
load mobile styles last, fix #19596
 2016-04-05 14:33:19 +02:00
Thomas Müller
64d400b5df Prevent null to be passed into the closure of callForAllUsers 2016-04-05 10:26:04 +02:00
Thomas Müller
2a7e9f08ff Merge pull request #23791 from owncloud/fix-swift-test-mkfifo 
Remove any stray socket files before creating new ones
 2016-04-05 10:00:37 +02:00
Thomas Müller
7bdde98617 All webdav endpoints within remote.php are now hardcoded - helps to prevent migration issues like #23610 - furthermore there is no need to dynamically lookup all the endpoints we already know 2016-04-05 09:59:43 +02:00
Jan-Christoph Borchardt
73a6664ca8 load mobile styles last, fix #19596 2016-04-05 09:47:39 +02:00
Thomas Müller
961bb4c3e3 Merge pull request #23677 from owncloud/db-schema-migration-feedback 
Show individual sql schema migration steps during upgrade - on web as…
 2016-04-05 09:39:35 +02:00
Robin McCorkell
d47824f4cf Remove any stray socket files before creating new ones 2016-04-05 09:17:21 +02:00
Thomas Müller
808a25bc5d Merge pull request #23767 from owncloud/remove-unrequired-randomlib 
Remove unrequired randomlib
 2016-04-05 09:17:00 +02:00
Jenkins for ownCloud
6b571ea2db [tx-robot] updated from transifex 2016-04-05 01:55:53 -04:00
Morris Jobke
96cdc07255 Merge pull request #23682 from owncloud/group_sharing_disabled_capability 
Add capability to show if group sharing is enabled
 2016-04-04 23:21:03 +02:00
Roeland Jago Douma
ab034f0593 Add intergration tests 2016-04-04 19:35:01 +02:00
Roeland Jago Douma
db5ea95e29 Add capability to show if group sharing is enabled 
fixes #23477

Now clients can correct wording to properly reflect who a user can share
with.
 2016-04-04 19:35:01 +02:00
Thomas Müller
f6b846584b Handle case where the user is not known - fixes #23759 2016-04-04 16:56:59 +02:00
Morris Jobke
6ecd1d9e86 Fix PHP memory leak in file_get_contents() 
* ref https://bugs.php.net/bug.php?id=61961

* ref https://github.com/owncloud/core/issues/20261#issuecomment-180000256

* code is based on the proposal of @chriseqipe

* fixes #20261
 2016-04-04 16:48:09 +02:00