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

26252 commits

This branch
This branch
All branches
Author SHA1 Message Date
Vincent Petry
22b63ecd12 Load missing JS dep in public link page 2015-08-18 11:35:21 +02:00
Thomas Müller
03965053c3 Merge pull request #18364 from owncloud/config-sample-tyops 
clean up typos in config.sample.php
 2015-08-17 20:22:24 +02:00
Carla Schroder
05b738ac01 clean up typos in config.sample.php 2015-08-17 10:38:42 -07:00
Robin McCorkell
675d852c7d Merge pull request #17182 from owncloud/user_ini_upload_size 
Update .user.ini when setting upload size limit
 2015-08-17 13:27:47 +01:00
Thomas Müller
47e05c97a2 Merge pull request #18345 from owncloud/increase-setMailAddress-tests 
[tests] more tests for UserController::setMailAddress
 2015-08-17 12:45:50 +02:00
Thomas Müller
f50f43fd9c Merge pull request #18343 from owncloud/degrade-log-about-missing-app 
Degrade log message about missing app in appstore to debug
 2015-08-17 12:17:41 +02:00
Morris Jobke
15da671349 [test] more tests for UserController::setMailAddress 
* fixes #12885
 2015-08-17 11:53:03 +02:00
Morris Jobke
24e20a51eb Degrade log message about missing app in appstore to debug 
* fixes #18154
 2015-08-17 11:27:41 +02:00
Robin McCorkell
f74416a0cb Merge pull request #18331 from owncloud/fix-htaccess-whitespace 
properly indent .htaccess
 2015-08-16 21:15:27 +01:00
Morris Jobke
df81019a1e properly indent .htaccess 2015-08-16 15:40:03 +02:00
Morris Jobke
5b7143885d Merge pull request #18318 from owncloud/files-sidebar-fixtabs 
Improve right sidebar tabs behavior
 2015-08-16 12:53:50 +02:00
Thomas Müller
184b4e7d19 Merge pull request #18320 from owncloud/public_upload_capability 
Add public upload to capability
 2015-08-14 21:01:41 +02:00
Roeland Jago Douma
dce5d9b5d1 Add public upload to capability 2015-08-14 20:03:32 +02:00
Thomas Müller
72f829eb06 Merge pull request #18316 from owncloud/event-dispatcher 
Event dispatcher
 2015-08-14 19:51:23 +02:00
Thomas Müller
dfba425d68 Integration in files app to load scripts and styles on request 2015-08-14 18:04:17 +02:00
Vincent Petry
e2549fa660 Improve right sidebar tabs behavior 
Tab heads are not rendered if only one tab.

The tab contents is updated on-demand. This means that if a tab is not
visible it is not rendered at first. If the tab was already rendered
through switching, its model will not get updated until the next time it
becomes visible. This will prevent needless rerendering of invisible tab
contents, especially considering that some tabs might need extra ajax
requests.
 2015-08-14 16:51:04 +02:00
Thomas Müller
0b64268910 Adding EventDispatcher to IServerContainer 2015-08-14 15:40:15 +02:00
Thomas Müller
ddc7f668e5 Merge pull request #18271 from owncloud/issue-18261-sharing-capabilities-use-wrong-default 
Fix default values of sharing capabilities
 2015-08-14 12:23:06 +02:00
Morris Jobke
4dbf666fdf Merge pull request #18302 from owncloud/mark-ldap-password-as-sensitive 
Mark ldap agent password as sensitive
 2015-08-14 11:28:31 +02:00
Joas Schilling
49ba7dc05d Mark ldap agent password as sensitive 2015-08-14 09:07:07 +02:00
Bernhard Posselt
4e327d058c Merge pull request #18090 from owncloud/keep-ocs-status-code-in-sync 
[OCS] With V2 we should ensure that the status codes are kept in sync
 2015-08-14 08:59:08 +02:00
Morris Jobke
1f96fb3352 Merge pull request #18279 from owncloud/fix-ldap-proxy-everyonecount 
also don't count group members when more than 1 ldap configs are active
 2015-08-13 17:18:09 +02:00
Jan-Christoph Borchardt
4e53b5922d Merge pull request #18178 from owncloud/files-sidebar-actions 
Sidebar file actions
 2015-08-13 17:17:10 +02:00
Morris Jobke
af7ffe5492 Merge pull request #18262 from owncloud/add-basic-tests-for-scanners 
Add a basic unit test which notifies us about incompatible extending
 2015-08-13 15:36:17 +02:00
Arthur Schiwon
571e99b152 also don't count group members when more than 1 ldap configs are active 2015-08-13 14:44:17 +02:00
Joas Schilling
20d8576d3d Fix config map provider for tests 2015-08-13 13:07:49 +02:00
Joas Schilling
70504920e7 Fix default values of sharing capabilities 
The problem is the UI used a different default than the capabilities.
So when you never touched the config, the setting in admins said "disabled"
while the capabilities said "enabled".
 2015-08-13 12:46:52 +02:00
Joas Schilling
acc452ae74 Add a basic unit test which notifies us about incompatible extending 2015-08-13 11:38:10 +02:00
Thomas Müller
1d219cf799 With V2 we should ensure that the status codes are kept in sync 2015-08-13 10:45:25 +02:00
Vincent Petry
55dc74bba4 Merge pull request #16543 from rullzer/files_sharing_proper_function_args 
files_sharing private function to proper signature
 2015-08-13 10:13:21 +02:00
Vincent Petry
b811124aac Merge pull request #18231 from owncloud/fix-show-shared-storage-full-temporary 
Show storage full warning for shared storages temporary
 2015-08-13 10:05:53 +02:00
Jan-Christoph Borchardt
970440f604 Merge pull request #18122 from owncloud/replace-tipsy 
Replace tipsy with tooltip
 2015-08-13 09:12:53 +02:00
Morris Jobke
6f909b19cc Merge pull request #17785 from owncloud/snapjs-sensitivity 
fix mobile scrolling, lower sidebar sensitivity, fix #11193
 2015-08-12 23:20:08 +02:00
Hendrik Leppelsack
e5444a1a5d replace tipsys with tooltips 2015-08-12 23:09:49 +02:00
Morris Jobke
9872411909 Merge pull request #18242 from owncloud/password-feedback 
more understandable 'Wrong password' feedback
 2015-08-12 22:55:50 +02:00
Jan-Christoph Borchardt
e16cf0c45f more understandable 'Wrong password' feedback 2015-08-12 18:43:09 +02:00
Vincent Petry
c964eff17b Make file actions work from sidebar 
The favorite icon in the sidebar now triggers the file action and also
updates itself according to the model's state when triggered from the
file row.

The thumbnail triggers the default action.

Currently only one FileInfoModel is used for the selection and state
synchronization between views.

FileList reload now auto-closes the sidebar.
 2015-08-12 17:30:20 +02:00
Vincent Petry
997577cf7a Introduce FileInfoModel 
FileInfoModel is a backbone model that will make it possible to track
changes and update views accordingly
 2015-08-12 17:29:54 +02:00
Vincent Petry
aac7c19ab7 Fix showMenu animation callback 2015-08-12 17:28:55 +02:00
Morris Jobke
e6bf4e559a Show strage full warning for shared storages temporary 
* removed the setDefault call because then it will always be
  reshown
  * was added with ba475d4862
* fixes #18208
 2015-08-12 14:14:43 +02:00
Thomas Müller
326de6f9b4 Merge pull request #18065 from owncloud/new-trashbin-retention 
New trashbin retention
 2015-08-12 13:13:45 +02:00
Thomas Müller
abd3d5c6a5 Merge pull request #17982 from owncloud/appframework-sanitize-name 
Sanitize class names before registerService/query
 2015-08-12 12:19:24 +02:00
Thomas Müller
33727131ac Merge pull request #17865 from rullzer/less_static_prov_api 
Move Provisioning API to OCP
 2015-08-12 12:16:55 +02:00
Thomas Müller
eb13cb8d75 Merge pull request #18127 from owncloud/dav-request-tests 
add test framework for doing full request webdav tests
 2015-08-12 10:07:20 +02:00
Robin McCorkell
24e45d5954 Merge pull request #18207 from owncloud/bump-version 
Bump version patch number, fixes #18129
 2015-08-11 17:43:41 +01:00
Robin McCorkell
cd5342d0ff Merge pull request #18202 from owncloud/revert-route-breaking-changes 
Revert route breaking changes
 2015-08-11 15:28:06 +01:00
Robin McCorkell
fa8b1074e8 Bump version patch number, fixes #18129 2015-08-11 14:43:32 +01:00
Roeland Jago Douma
b41bccd385 Check for userSession->getUser() === null 2015-08-11 15:37:06 +02:00
Roeland Jago Douma
b25c3beb2f [provisioning api] Fix grouptest 2015-08-11 15:22:59 +02:00
Roeland Jago Douma
77b6e3d5ec Extend tests for files_sharing api 2015-08-11 15:16:35 +02:00