Commit Graph

9510 Commits

Author SHA1 Message Date
Robin Appelman 929b8c3e69 fix files_version hooks 2013-01-28 20:04:10 +01:00
Robin Appelman 7207211f3a change required ownCloud version to 4.91 2013-01-28 19:58:24 +01:00
Jan-Christoph Borchardt 01b3c088a9 fix color change on click 2013-01-28 19:47:51 +01:00
Jan-Christoph Borchardt a78ae6a5cb Merge branch 'master' into permanent-share-icons 2013-01-28 19:39:51 +01:00
Robin Appelman 74f6f85628 merge master into filesystem 2013-01-28 19:37:58 +01:00
Jan-Christoph Borchardt 3bafa87a12 merge styles 2013-01-28 19:36:21 +01:00
Jan-Christoph Borchardt feb65c89f2 update Files icon from home to files, update Home icon from checkbox to home 2013-01-28 19:20:07 +01:00
Robin Appelman 06c1c35ac9 Fix phpdoc 2013-01-28 19:08:30 +01:00
Björn Schießle 4b7b092008 rename Name to Login Name 2013-01-28 17:05:20 +01:00
Björn Schießle f3a99f4869 show display name in input field 2013-01-28 17:01:37 +01:00
Björn Schießle 590c4aa710 search display name instead of uid; fix key/value order for array access 2013-01-28 15:58:40 +01:00
Björn Schießle c00b66fe5b implement DisplayNamesInGroup for database back-end 2013-01-28 15:47:57 +01:00
Robin Appelman 232cc3211b add oc:// streamwrapper to provide access to ownCloud's virtual filesystem 2013-01-28 15:35:30 +01:00
Robin Appelman c9c919da57 Move streamwrappers to seperate files and put them in a namespace 2013-01-28 15:34:15 +01:00
Björn Schießle 320233ec3d merge conflict fixed 2013-01-28 15:10:00 +01:00
Björn Schießle e6cc0cd08a implement display names for the database back-end 2013-01-28 15:07:31 +01:00
Lukas Reschke 99ec26578a Merge pull request #1313 from owncloud/updater-CSP
Make update page with CSP compatible
2013-01-28 05:43:47 -08:00
Björn Schießle 3e0d117d60 add display name to the database table oc_users 2013-01-28 14:38:38 +01:00
Björn Schießle 70c3ab3c53 update the display name for the database back-end 2013-01-28 14:23:15 +01:00
Björn Schießle e0f2ed2757 interface and API to change display names 2013-01-28 14:09:11 +01:00
Jan-Christoph Borchardt aaac2414ea undo padding change on buttons, otherwise it will mess up the upload and new buttons again 2013-01-28 13:16:30 +01:00
Björn Schießle 022a7b13b8 prepare user table to show and edit display names 2013-01-28 13:12:44 +01:00
Björn Schießle 996b5cf368 change order, key -> uid and value -> display name, this way it is also possible to have non-unique display names 2013-01-28 13:10:54 +01:00
Björn Schießle f28857377d use hidden input field to disable sharing 2013-01-28 11:28:16 +01:00
Björn Schießle 8067a1394e fix merge conflicts 2013-01-28 11:18:04 +01:00
Jan-Christoph Borchardt 329d965441 merge changes in navigation 2013-01-28 10:52:15 +01:00
Thomas Müller 857b15db37 Merge pull request #1318 from j-ed/master
added parameter mail_smtpauthtype to set SMTP authentication type.
2013-01-28 01:42:46 -08:00
Thomas Mueller 1d44a99ebb Merge branch 'master' into updater-CSP
Conflicts:
	core/templates/update.php
2013-01-28 09:57:24 +01:00
Thomas Mueller 11e88f4939 call ajax scan only if a user is logged in - otherwise we'll get a 500 2013-01-28 09:48:03 +01:00
Thomas Mueller 47ce3c2160 include keyboardshortcuts.js 2013-01-28 09:47:21 +01:00
Thomas Mueller 03a1a20316 fixing href for folders 2013-01-28 09:46:52 +01:00
Thomas Müller 31d83fddc4 Merge pull request #1321 from owncloud/csp-fixes
Files: CSP fixes
2013-01-28 00:29:46 -08:00
Thomas Müller 44d6ff61e2 Merge pull request #1337 from owncloud/fix-issue-780
Add create permission, fixes #780
2013-01-27 23:52:09 -08:00
Michael Gapczynski 10c428830e Add create permission, fixes #780 2013-01-27 23:31:31 -05:00
Robin Appelman bca5ce724e Merge branch 'master' into filesystem 2013-01-28 02:35:51 +01:00
Robin Appelman 3e59a87153 Filesystem: use the updated Mount::findById in getPath to ensure we get the correct path if the storage is also mounted outside the view 2013-01-28 01:02:04 +01:00
Robin Appelman 577e3b11d7 Filesystem: return all matching mounts in Mount::findById 2013-01-28 00:59:43 +01:00
Jenkins for ownCloud b655444709 [tx-robot] updated from transifex 2013-01-28 00:05:43 +01:00
Lukas Reschke 9e498b6548 Merge pull request #1326 from owncloud/event-source-token
Use global oc_requesttoken for Event Source
2013-01-26 15:18:23 -08:00
Robin Appelman 4cae141673 Filesystem: also add getPath to \OC\Filesystem 2013-01-27 00:18:15 +01:00
Robin Appelman 17bcea1585 Filesystem: add View->getPath to the cache api 2013-01-27 00:13:50 +01:00
Robin Appelman 9e2a066c7b Cache: add function to get storage id and internal path of a file by id 2013-01-27 00:13:50 +01:00
Robin Appelman 8c42e2de8c Test cases for new mount management 2013-01-27 00:13:49 +01:00
Robin Appelman 69f11151e9 Filesystem: add Mount::findById 2013-01-27 00:13:49 +01:00
Jenkins for ownCloud 00a28062e1 [tx-robot] updated from transifex 2013-01-27 00:06:21 +01:00
TheSFReader 9c7a18044d Merge remote-tracking branch 'refs/remotes/upstream/master' 2013-01-26 23:19:40 +01:00
Michael Gapczynski 0986b6f910 Use global oc_requesttoken for Event Source 2013-01-26 16:36:48 -05:00
Michael Gapczynski 03b947e3ec Don't check for updates for sub storages, these scans should be done in the background 2013-01-26 16:11:35 -05:00
Robin Appelman f25db779d9 Filesystem: move mount management to it's own class 2013-01-26 21:44:33 +01:00
Robin Appelman 177537dbcc Cache: port test cases to PHPUnit 2013-01-26 21:44:33 +01:00