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

2555 commits

Author SHA1 Message Date
Thomas Müller
8fe878afe9 Merge pull request #20602 from owncloud/fix-installed-apps 
Always installed apps includes the hardcoded ones from shipped.json
 2015-11-26 16:50:05 +01:00
Thomas Müller
80c43ffc6c Merge pull request #20702 from owncloud/move-user-principal-into-subfolder 
Users are available under it's own principal resource named 'principa…
 2015-11-26 16:49:49 +01:00
Thomas Müller
19d5059109 Merge pull request #20393 from owncloud/querybuilder-select-with-alias 
Add a method to select a field or value with alias
 2015-11-26 16:19:20 +01:00
Thomas Müller
3882cc8ef3 Merge pull request #20744 from owncloud/oc_helper-getMimeType-cleanup 
Remove last occurences of OC_Helper::getMimeType()
 2015-11-26 12:37:25 +01:00
Thomas Müller
5a33390a69 Merge pull request #20731 from owncloud/per-storage-updater 
Make Cache\Updater per storage
 2015-11-26 12:01:44 +01:00
Morris Jobke
4fcab98694 Remove unused internal methods 
* removes OC_Helper::mb_substr_replace and OC_Helper::mb_str_replace
* keeps public interface wrapper working as expected
 2015-11-26 10:25:43 +01:00
Morris Jobke
9318606faf Remove last occurences of OC_Helper::getMimeType() 
* ref #4774
 2015-11-26 10:18:32 +01:00
Thomas Müller
b799e42b4e Introduce \OCP\IUser::getEMailAddress() 2015-11-25 22:23:34 +01:00
Thomas Müller
9ec2f8886e Merge pull request #20691 from owncloud/share2.0_di_fixes 
[Sharing 2.0] di fixes
 2015-11-25 15:25:50 +01:00
Robin Appelman
b025f07fb7 Make Cache\Updater per storage 2015-11-25 14:16:00 +01:00
Thomas Müller
50f6817ce9 Merge pull request #20439 from owncloud/etag-propagate-in-storage 
Take submount etag into account for folder etags
 2015-11-25 12:49:54 +01:00
Roeland Jago Douma
a2b8483779 [Sharing 2.0] Default share provider only generic DI 
No injection of userfolders etc. Only generic DI components
(IRootFolder) etc should be used to make sure we can also run this from
the cli
 2015-11-24 10:26:36 +01:00
Roeland Jago Douma
aeae73b364 [Sharing 2.0] Removed unused DI stuff 
The share manager etc should not care about filtering stuff. They should
return what is asked for them.
 2015-11-24 10:26:36 +01:00
Joas Schilling
018bd3ee24 Make sure that object id can be a string 2015-11-23 14:18:15 +01:00
Thomas Müller
df906f475b Merge pull request #20617 from owncloud/fix-usage-of-lastInsertId 
lastInsertId() is properly working with Oracle if the table name is p…
 2015-11-23 13:29:08 +01:00
Thomas Müller
240cc1c4ea Merge pull request #20543 from owncloud/share2.0_fix_hooks 
Move hook and delete children logic to share manager
 2015-11-23 13:28:49 +01:00
Joas Schilling
1c7d7288c4 Add a method to select a field or value with alias 2015-11-23 13:28:31 +01:00
Thomas Müller
f85282c90a Merge pull request #20577 from owncloud/notifications-datetime-timestamp 
Use a DateTime object instead of a timestamp
 2015-11-23 13:14:45 +01:00
Morris Jobke
bc69cb2de3 fix unit tests 2015-11-23 13:13:26 +01:00
Roeland Jago Douma
1360e22d7c [Sharing 2.0] Move hook and delete children logic to share manager 
To make sure hooks are always fired and child entries are always
cleaned. This logic is moved to the share manager.

* Updated unit tests
 2015-11-23 12:28:54 +01:00
Thomas Müller
9f69021691 lastInsertId() is properly working with Oracle if the table name is properly passed in 2015-11-23 11:44:08 +01:00
Joas Schilling
a370c29068 Use a DateTime object instead of a timestamp 2015-11-23 11:41:48 +01:00
Thomas Müller
bf672d7e51 Merge pull request #20222 from owncloud/federated_sharing_auto_complete 
federated sharing auto-complete, first step
 2015-11-23 10:42:14 +01:00
Thomas Müller
79bbda994b Merge pull request #16902 from owncloud/jsocclient 
Web UI uses Webdav instead of ajax/* calls
 2015-11-23 09:38:01 +01:00
Thomas Müller
358858c9e3 Fix undefined HTTP_USER_AGENT 2015-11-22 16:05:50 +01:00
Vincent Petry
f120846e29 Added OC.Files.Client Webdav-based files client 2015-11-22 16:05:49 +01:00
Roeland Jago Douma
0265bcfdae Moved changedisplayname to usercontroller 
Killed the old static route to change a users display name and moved it
to a properly testable controller.
 2015-11-20 16:05:43 +01:00
Thomas Müller
427d107b9f Merge pull request #20614 from owncloud/use-mocks-when-testing-isSharingDisabledForUser 
Use mocks when testing isSharingDisabledForUser
 2015-11-20 15:22:52 +01:00
Björn Schießle
ed039ee5eb added app "federation", allows you to connect ownClouds and exchange user lists 2015-11-19 18:06:38 +01:00
Thomas Müller
c565a7b042 Fix failing unit test 💀 2015-11-19 16:44:43 +01:00
Thomas Müller
9ec2850c78 Use mocks when testing isSharingDisabledForUser 2015-11-19 15:36:16 +01:00
Robin Appelman
a95d4c2b22 update tests 2015-11-19 13:32:04 +01:00
Robin Appelman
888df3933d take the etag of child mounts into account for the folder etag 
this replaces shared etag propagation
 2015-11-19 13:32:00 +01:00
Joas Schilling
0b8335ff2f Make the JobList test more robust by sorting the result of getAll before comparison 2015-11-19 09:25:34 +01:00
Thomas Müller
8db9c49cda Merge pull request #20551 from owncloud/notification-fix-tests 
Notification - Add tests for the "return $this" and fix it on the new method
 2015-11-18 09:12:27 +01:00
Thomas Müller
74ce6d29e1 Merge pull request #20544 from owncloud/move-index-to-appframework 
Move index.php from files to AppFramework
 2015-11-17 12:49:38 +01:00
Joas Schilling
2fde6a77d7 Add tests for the "return $this" and fix it on the new method 2015-11-17 09:26:13 +01:00
Thomas Müller
705d208a8a Merge pull request #20539 from owncloud/notification-api-adjustment 
Notification api update
 2015-11-17 08:39:06 +01:00
Lukas Reschke
daa388ce8d Move index.php from files to AppFramework 
1. Allows it to use the more secure CSP rules of the AppFramework.
2. Adds some unit tests.
 2015-11-16 21:10:11 +01:00
Joas Schilling
40d5d55124 Remove the icon for now 2015-11-16 16:17:23 +01:00
Joas Schilling
1666af89c2 Add "is primary action" to actions 2015-11-16 16:14:52 +01:00
Roeland Jago Douma
1e9fc33212 [Share2.0] OCS Share API getShare uses new code 2015-11-16 13:32:28 +01:00
Roeland Jago Douma
fee6847f48 [Avatar] No need to setup FS for avatar tests 2015-11-14 14:52:51 +01:00
Christian Schnidrig
d0464bf772 enable microseconds in log timestamps 2015-11-12 10:33:20 +01:00
Robin Appelman
20cad09f7f Add tests for FileInfo owner 2015-11-10 11:06:48 +01:00
Robin Appelman
960c8cb5bc Merge pull request #16604 from owncloud/cache-escape-like 
escape like parameter in cache operations
 2015-11-10 09:45:00 +01:00
Roeland Jago Douma
87e3402ef5 Fix autoloader unit test output 
Removed leftover print statement
 2015-11-09 15:54:40 +01:00
Roeland Jago Douma
0bb5eadf89 [autoloader] Make sure to load construct full paths 
This reduces a lot of the autoloader magic and makes sure that we
generate full paths in the autoloader.
 2015-11-06 13:36:19 +01:00
Thomas Müller
cc4f4f222d Merge pull request #20348 from owncloud/issue-20303-integer-group-names 
Make sure that group names are strings not integers
 2015-11-06 11:48:40 +01:00
Thomas Müller
8047597a81 Merge pull request #20288 from owncloud/fix_20234 
make sure that we update the unencrypted size for the versions
 2015-11-06 11:17:17 +01:00