Commit Graph

4539 Commits

Author SHA1 Message Date
Arthur Schiwon 8fd263ef63 LDAP: update quota on every uncached userExists, i.e. also on every isLoggedIn, fixes #1278 2013-01-30 03:57:46 +01:00
Arthur Schiwon e8db1e884e LDAP: some inline documentation 2013-01-30 03:44:11 +01:00
Arthur Schiwon 14bc6f8c6c LDAP: working visual feedback on save. Save button will be highlighted green or red. 2013-01-30 03:34:51 +01:00
Arthur Schiwon 19867b1d08 LDAP: make sure app meta data is not deleted from database when deleting configuration with empty prefix 2013-01-30 02:39:44 +01:00
Arthur Schiwon a557522037 LDAP: send back error message properly 2013-01-30 02:39:11 +01:00
Arthur Schiwon 9f7d780276 LDAP: use consolidated method for determining config prefix 2013-01-30 02:31:14 +01:00
Arthur Schiwon a8ac4bdf79 LDAP: Always preset configuration prefix when no configuratin is stored or all remaining ones are deleted 2013-01-30 02:30:24 +01:00
Jenkins for ownCloud 68266e70f2 [tx-robot] updated from transifex 2013-01-30 00:25:41 +01:00
Lukas Reschke 250c565d2b Merge pull request #1360 from owncloud/display_name
introduction of display names
2013-01-29 14:05:54 -08:00
Arthur Schiwon f33b72677b LDAP: implement support for ownCloud Display Names 2013-01-29 20:41:48 +01:00
Björn Schießle 0c8bcacdc8 added some additional error handling 2013-01-29 13:36:33 +01:00
Björn Schießle eafd34684c seperate css no longer needed, use files app css instead 2013-01-29 10:08:41 +01:00
Björn Schießle d10e137939 icons added; empty trash bin message added 2013-01-29 10:03:04 +01:00
Michael Gapczynski 5143660cd3 Merge pull request #1324 from owncloud/permanent-share-icons
Permanently display shared status icons
2013-01-28 20:17:40 -08:00
Jenkins for ownCloud 8c4931a645 [tx-robot] updated from transifex 2013-01-29 00:06:20 +01:00
Robin Appelman a67f11c8af Sharing: partailly fix searchByMime 2013-01-28 21:25:19 +01:00
Robin Appelman 86e5a9cd73 Files: fix sharing newly uploaded files 2013-01-28 21:09:18 +01:00
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
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
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 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 31d83fddc4 Merge pull request #1321 from owncloud/csp-fixes
Files: CSP fixes
2013-01-28 00:29:46 -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
Jenkins for ownCloud b655444709 [tx-robot] updated from transifex 2013-01-28 00:05:43 +01:00
Jenkins for ownCloud 00a28062e1 [tx-robot] updated from transifex 2013-01-27 00:06:21 +01:00
Robin Appelman 930b9b9cd0 merge master into filesystem 2013-01-26 18:49:45 +01:00
Lukas Reschke 2e42c6f54f Use HTML5 data attribute + fix undefined variable 2013-01-26 14:07:35 +01:00
Lukas Reschke 6c882d9806 Remove outdated comments 2013-01-26 14:03:17 +01:00
Thomas Müller 276d98b9dd Merge pull request #1059 from owncloud/fixing-998-master
Fixing 998 master
2013-01-26 04:15:40 -08:00
Jenkins for ownCloud af4411e33d [tx-robot] updated from transifex 2013-01-26 00:10:07 +01:00
raghunayyar a86da16a10 More Style Fixes
Remove Repeating Background behind folder names in files app
part.breadcrumb.php
2013-01-25 20:50:55 +05:30
Lukas Reschke 047f1988c3 Merge branch 'master' into no-inline-js 2013-01-25 16:11:07 +01:00
Björn Schießle 839f4bd949 show display name instead of uid in the public shared files view 2013-01-25 13:01:53 +01:00
Jenkins for ownCloud 6832dddf39 [tx-robot] updated from transifex 2013-01-25 00:05:56 +01:00
Arthur Schiwon 3e99f12120 LDAP: make settings strings in JS translatable 2013-01-24 22:47:25 +01:00
Arthur Schiwon 2749a14171 LDAP: make it possible to enable/disable server configurations 2013-01-24 22:39:05 +01:00
Thomas Mueller ef88ceba8c drop SimpleTest compatibility 2013-01-24 16:47:17 +01:00
Björn Schießle dbb0d04073 restore file in the root folder if the origin folder is not writable 2013-01-24 15:29:22 +01:00
Arthur Schiwon 6bc7256966 LDAP: forgotten file for deleteConfig feature 2013-01-24 14:12:12 +01:00
Arthur Schiwon 5b9e181198 LDAP: implement deleteConfiguration feature 2013-01-24 14:11:53 +01:00
Arthur Schiwon 3bf38c7a84 LDAP: add missing new LDAP Helper 2013-01-24 13:01:43 +01:00
Arthur Schiwon fccfdb2a52 LPAP: cleanup settings.php, it's already ajaxified 2013-01-24 13:01:20 +01:00
Arthur Schiwon b2ea78c00d LDAP: improve and cleanup settings JS 2013-01-24 13:00:40 +01:00
Arthur Schiwon b084ed6a42 LDAP: clean up, save configuration is now handled by Ajax 2013-01-24 12:46:10 +01:00
Arthur Schiwon 319dcd45e1 LDAP: Clear cache on saving settings 2013-01-24 12:44:30 +01:00
Arthur Schiwon 96949fc9dd LDAP: consolidate config prefix determination, autofill combo box in settings 2013-01-24 12:42:28 +01:00
Jenkins for ownCloud 3ff32eba25 [tx-robot] updated from transifex 2013-01-24 00:07:38 +01:00
Arthur Schiwon b979bf6f1c LDAP: fix default 2013-01-23 23:46:55 +01:00
Arthur Schiwon 06c284f6cc LDAP settings: read configuration when another server config is chosen 2013-01-23 23:41:35 +01:00
Arthur Schiwon 83d9e1e2f0 make sure that Configuration is read when getConfiguration is called. And give back the appropriate result. 2013-01-23 23:40:21 +01:00
Björn Schießle 6ab95e8e33 code clean-up 2013-01-23 11:30:42 +01:00
Lukas Reschke c8bbbb48d3 Merge master... 2013-01-23 11:30:40 +01:00
Thomas Mueller 5fadd53088 missing renames of publicListView to disableSharing 2013-01-23 09:18:26 +01:00
Jenkins for ownCloud c986dbe573 [tx-robot] updated from transifex 2013-01-23 00:06:18 +01:00
Robin Appelman f858381775 merge master into filesystem 2013-01-22 23:27:04 +01:00
Björn Schießle 367aadb3b7 rename 'publicListView' switch to 'disableSharing' because this is not only used for the public list view 2013-01-22 18:34:59 +01:00
Sam Tuke aa648fca75 Merge branch 'master' into files_encryption
Conflicts:
	apps/files_encryption/templates/settings.php
2013-01-22 17:31:05 +00:00
Sam Tuke 47592657d7 Added localisation for encryption settings 2013-01-22 17:15:03 +00:00
Björn Schießle f919230f63 remove inline JavaScript 2013-01-22 17:59:33 +01:00
Sam Tuke 619780a67d Merge branch 'master' into files_encryption 2013-01-22 16:50:20 +00:00
Björn Schießle 16ae902e31 no undo notification for deleted file, we use the trash bin instead 2013-01-22 17:43:46 +01:00
Björn Schießle b694f996d9 allow admin to change retention obligation for the trash bin, default value is 180 days 2013-01-22 15:33:54 +01:00
Björn Schießle 16d7716dee calculate correct relative date for trashbin file list 2013-01-22 15:33:54 +01:00
Björn Schießle 97e69e5374 remove table row in trash bin view after undelete 2013-01-22 15:33:54 +01:00
Björn Schießle 81ab0affef allow to restore single files/folder from a deleted folder 2013-01-22 15:33:54 +01:00
Björn Schießle 1817c7895b allow to look into deleted directories 2013-01-22 15:33:54 +01:00
Björn Schießle 1255791ef2 handle group restore 2013-01-22 15:33:54 +01:00
Björn Schießle 655a20f963 expire files in trash bin after 30 days 2013-01-22 15:33:54 +01:00
Björn Schießle 8e57fe1a08 remove unneeded function 2013-01-22 15:33:54 +01:00
Björn Schießle a3da82261b remove item in the trash bin view after successful undelete 2013-01-22 15:33:53 +01:00
Björn Schießle d605228937 first version of the trash bin app 2013-01-22 15:33:53 +01:00
Björn Schießle 8259768732 introduce option to disable download action 2013-01-22 15:33:53 +01:00
Björn Schießle dfab3d3d7f call the trash bin view 2013-01-22 15:33:53 +01:00
Björn Schießle 9bacb0e179 rename "publicListView" option to "disableSharing", this is more meaningful also because it is not only useful for the public list view 2013-01-22 15:33:53 +01:00
Björn Schießle f15deaf556 listen to post delete event to allow the trash bin to create a copy of the version first 2013-01-22 15:32:57 +01:00
Björn Schießle 9d77317de8 add trash button to web interface 2013-01-22 15:32:57 +01:00
Lukas Reschke bd5ff29716 Merge branch 'master' into no-inline-js 2013-01-22 11:50:33 +01:00
Michael Gapczynski e666ce3622 Fix external storage UI for new storage namespaces 2013-01-21 23:57:26 -05:00
Robin Appelman f2d0eeae83 Merge branch 'master' into filesystem 2013-01-22 00:19:44 +01:00
Lukas Reschke 8223117569 Remove closing tag 2013-01-21 22:29:27 +01:00
Robin Appelman 1762378f67 Files: don't load fileactions.js when upgrading filecache 2013-01-21 22:07:55 +01:00
Lukas Reschke 9bc8df3649 Move publicListView to external JS 2013-01-21 20:36:19 +01:00
Lukas Reschke 0d02caa684 No inline JS in apps 2013-01-21 20:34:28 +01:00
Jenkins for ownCloud aede26d996 [tx-robot] updated from transifex 2013-01-21 00:05:34 +01:00
Arthur Schiwon 10876aba89 fix more config keys for save settings handling 2013-01-20 18:30:14 +01:00
Arthur Schiwon 0c3466325b fix continue in switch, add another key to skip 2013-01-20 18:27:39 +01:00
Arthur Schiwon 6d84aa93d3 Ajaxifiy Settings Save 2013-01-20 18:02:44 +01:00
Robin Appelman 83d6221322 merge master into filesytem 2013-01-20 03:11:04 +01:00
Jenkins for ownCloud ebc0c4b85b [tx-robot] updated from transifex 2013-01-20 00:06:40 +01:00
Thomas Mueller 5d6c1d52bd replace #notification with OC.Notification call 2013-01-19 21:37:05 +01:00
Thomas Mueller b8318e6df4 Merge branch 'master' into fixing-998-master
Conflicts:
	apps/files/js/files.js
2013-01-19 15:58:15 +01:00
Lukas Reschke 53b95cb8fd Merge pull request #1230 from owncloud/remove-unused-autocomplete.php
Remove uneeded file
2013-01-19 05:56:27 -08:00
Jan-Christoph Borchardt ae244972cb Merge pull request #1228 from owncloud/generating_zip_message
Make the ZIP download information friendlier
2013-01-19 04:33:39 -08:00