Commit Graph

5940 Commits

Author SHA1 Message Date
Michael Gapczynski 4c7fd8cd01 Merge branch 'master' into share_api
Conflicts:
	lib/group.php
	lib/group/backend.php
	lib/group/database.php
	lib/group/interface.php
	lib/public/user.php
	lib/user.php
	lib/user/backend.php
	lib/user/database.php
	lib/user/interface.php
2012-08-14 10:22:13 -04:00
Arthur Schiwon 62e4f55f72 LDAP: adjust usersInGroup to updated interface 2012-08-14 14:30:03 +02:00
Arthur Schiwon 3c1380b093 LDAP: adjust getGroups to updated interface 2012-08-14 14:22:05 +02:00
Arthur Schiwon 452f55e163 adjust LDAP to updated interface 2012-08-14 14:14:20 +02:00
Robin Appelman 1522f7f211 fix some minor problems with path noramlization 2012-08-14 03:07:14 +02:00
Robin Appelman 0c8ce0bb32 some basic path normalization 2012-08-14 02:44:45 +02:00
Jenkins for ownCloud c312171252 [tx-robot] updated from transifex 2012-08-14 02:03:22 +02:00
Jenkins for ownCloud 19446fb22f [tx-robot] updated from transifex 2012-08-13 23:19:31 +02:00
Michael Gapczynski 830676b475 Improve usability for configuring Dropbox and Google Drive external storage 2012-08-13 17:10:58 -04:00
Michael Gapczynski d3bdab286b Suggest mount point name, don't reload custom javascript file 2012-08-13 17:10:58 -04:00
Michael Gapczynski 98c7d40fcd Throw exception in Dropbox and Google Drive storage constructors if parameters are not correct 2012-08-13 17:10:58 -04:00
Michael Gapczynski 863d3a43b2 Catch exceptions and write to log when creating storage object fails 2012-08-13 17:10:58 -04:00
Michael Gapczynski 7f12a65c24 Show access granted label immediately after granting access 2012-08-13 17:10:58 -04:00
Michael Gapczynski 0e6d22e25f Prevent editing Dropbox configuration input after access granted 2012-08-13 17:10:58 -04:00
Michael Gapczynski b6b2f8826b Show access granted label next to Google Drive and Dropbox storage in configuration 2012-08-13 17:10:58 -04:00
Michael Gapczynski be32625fcc Fix remove button display for external storage 2012-08-13 17:10:58 -04:00
Thomas Mueller 53f117c01a l10n directories have been missing 2012-08-13 23:10:10 +02:00
Thomas Tanghus d303763d1f Automatically check radio when new addressbook fields get focus. 2012-08-13 15:07:15 +02:00
Lukas Reschke e72a57f595 Also check for some other files 2012-08-13 00:57:01 +02:00
Thomas Mueller 3e504cf894 translation resources added and updated 2012-08-13 00:47:40 +02:00
Thomas Mueller 7ffd95e56d translation resources added and updated 2012-08-13 00:30:45 +02:00
Bart Visscher 758f476fe3 Calendar: remove not used style rules 2012-08-12 22:40:36 +02:00
Bart Visscher 73b1b68fff Rewrite remoteStorage settings, remove block echo 2012-08-12 22:30:13 +02:00
Bart Visscher ab8e7f1da3 Remove unused gallery template 2012-08-12 22:30:13 +02:00
Bart Visscher cb71996008 Change image links to use imagePath function 2012-08-12 22:30:13 +02:00
Michael Gapczynski 64ef1e2181 Change name of share function to shareItem, silly PHP 5.3.1 thinking it is a constructor... 2012-08-12 14:49:41 -04:00
Thomas Tanghus 329bc28d06 Commented out unused(?) class that interfered with appsettings. 2012-08-12 18:44:18 +02:00
Thomas Tanghus eb516b79b6 Position appsettings fixed and load it in dynamically added element. 2012-08-12 18:42:54 +02:00
Thomas Tanghus 7113e80184 Readded refresh param. 304 and ETag is still sent so shouldn't matter. 2012-08-12 17:30:09 +02:00
Jakob Sack 4d3d4522f9 Backgroundjobs: Fix wrong var names 2012-08-12 12:14:27 +02:00
Jakob Sack deef1f73db Backgroundjobs: fix bug in QueuedTask 2012-08-12 09:02:20 +02:00
Jenkins for ownCloud 355a1adb3a [tx-robot] updated from transifex 2012-08-12 02:04:58 +02:00
Jakob Sack 0c69e64b86 Backgroundjobs: Fix template 2012-08-12 00:44:25 +02:00
Jakob Sack 2bc8d3e5d6 Backgroundjobs: interface improvements 2012-08-12 00:37:14 +02:00
Michael Gapczynski a5a5ab2318 Add type text to new user, fixes display issue 2012-08-11 16:29:41 -04:00
Michael Gapczynski 651245effa Use limit and offset for subadmin users 2012-08-11 16:25:28 -04:00
Michael Gapczynski a1c88a3e39 Add search, limit, offset parameters to usersInGroups() 2012-08-11 16:25:28 -04:00
Michael Gapczynski 4f1b3631ba Change limit parameter in OC_User as well 2012-08-11 16:25:28 -04:00
Michael Gapczynski 400533af2c Start with 30 users, this fills my screen 2012-08-11 16:25:27 -04:00
Michael Gapczynski 874f31b8d7 Make getting all users and groups the default 2012-08-11 16:25:27 -04:00
Michael Gapczynski 9d2ae5fa1f Add infinite scrolling to Settings -> Users, still a little buggy 2012-08-11 16:25:27 -04:00
Michael Gapczynski 8d1eb674ec Add search, limit, and offset parameters to getUsers() and getGroups() 2012-08-11 16:25:27 -04:00
Michael Gapczynski baa0b4d530 Cast subadmin groups as strings 2012-08-11 16:25:27 -04:00
Lukas Reschke 5b16c7a25d This is unnessecary because we already run htmlentities() over the template engine 2012-08-11 20:53:56 +02:00
Jakob Sack bd90b7eaca Backgroundjobs: Fix bug in admin interface 2012-08-11 17:37:53 +02:00
Jakob Sack 1d7e3071e0 bump version to reate new tables 2012-08-11 17:32:17 +02:00
Jakob Sack bf7afa28d5 Backgroundjobs: cron.php now checks for mode=="none" 2012-08-11 17:18:49 +02:00
Lukas Reschke 0d8df3f55c Revert "Combine install checks in lib/base.php"
This reverts commit aa9fbf6639.
2012-08-11 17:07:35 +02:00
Michael Gapczynski 465767670b Check blacklist when renaming files 2012-08-11 11:04:04 -04:00
Jenkins for ownCloud 39b9052c2f [tx-robot] updated from transifex 2012-08-11 02:05:58 +02:00