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

4888 commits

Author SHA1 Message Date
Jörn Friedrich Dreyer
e8bf576184 add initial search in shared files 2013-09-19 21:08:32 +03:00
Bart Visscher
0a2a4cb12e update inherit docs comment 2013-09-19 18:59:06 +02:00
Bart Visscher
55efe1e56c Fix insert/update/delete helper functions for oracle 2013-09-19 18:13:39 +02:00
Bart Visscher
f6284bdce7 Add missing return true statements to legacy preferences functions 2013-09-19 18:13:06 +02:00
Bart Visscher
395cc737a1 Add missing static 2013-09-19 18:13:06 +02:00
Bart Visscher
445d34a2a9 Convert OC_Preference to object interface 2013-09-19 18:13:06 +02:00
Jörn Friedrich Dreyer
9f9eb1b08f Merge pull request #4263 from owncloud/search_scrollto 
initial scrollto implementation
 2013-09-19 05:49:45 -07:00
Thomas Tanghus
9e4d13858c Fix syntax error 2013-09-19 13:27:41 +02:00
Thomas Tanghus
d5126dd6b4 Merge branch 'appframework-master' into server_folder_methods 2013-09-19 12:32:32 +02:00
Thomas Tanghus
314ca843e8 Updated method names and added a few more tests. 2013-09-19 11:27:13 +02:00
Thomas Müller
76f8be3b7a fixing namespaces and rename hasCategory to hasTag 2013-09-18 22:49:09 +02:00
Thomas Müller
690e98d45a Merge branch 'appframework-master' into vcategories_public 
Conflicts:
	lib/server.php
 2013-09-18 22:36:25 +02:00
Thomas Müller
1274d6116d updating php docs 2013-09-18 22:22:51 +02:00
Jenkins for ownCloud
6b1843d91b [tx-robot] updated from transifex 2013-09-18 11:50:02 -04:00
Thomas Tanghus
09d043729a Note to self 2: Do as you preach. Test! 2013-09-18 15:02:25 +02:00
Thomas Tanghus
79cd655920 Note to self: Test before pushing!!! 2013-09-18 14:50:21 +02:00
Thomas Tanghus
2ef0b58ff6 Don't try to be clever 2013-09-18 14:25:12 +02:00
Thomas Tanghus
dd62ccdb4e Merge branch 'appframework-master' into public_cache 
Conflicts:
	lib/public/iservercontainer.php
	lib/server.php
 2013-09-18 13:20:07 +02:00
Thomas Tanghus
534933ee9b Use new emitter system 2013-09-18 13:15:38 +02:00
Thomas Tanghus
442a2e074c Update to adhere to the coding guidelines. 2013-09-18 12:35:46 +02:00
Thomas Tanghus
6ba23912a7 Add getUserFolder/getAppFolder to Server. 2013-09-18 12:34:10 +02:00
Thomas Tanghus
d3f88ceeb4 Add some docs to the sessions interface. 2013-09-18 12:01:01 +02:00
Bjoern Schiessle
1a60aa2b6a only remember password if the user changes the permissions, otherwise the user disabled the password protection 2013-09-18 11:49:02 +02:00
Thomas Müller
ce58c32c90 using OC_Config::$object->setValue in order to get the underlying exception thrown up to the caller 2013-09-18 11:07:19 +02:00
Thomas Müller
5ae4d67540 in case the cache cannot be initialized within the autoloader we just shoul not use it 2013-09-18 11:06:00 +02:00
Thomas Tanghus
b0762ad3bf OC_VCategories=>OC\Tags. Public interface + getter in server container 2013-09-18 00:37:00 +02:00
Thomas Tanghus
e760343b98 Merge branch 'appframework-master' into vcategories_public 2013-09-17 20:04:51 +02:00
Thomas Tanghus
8b4f4a79e2 Still some session leftovers. 2013-09-17 19:46:08 +02:00
Jörn Friedrich Dreyer
b40925ae17 initial scrollto implementation: 
use places/folder icon,
move link construction to JS,
only show icon on hover,
use 'searchresult' as css class name,
add filter/unfilter methods,
highlight searched files in current filelist
only filter when correct FileList is present
 2013-09-17 18:40:51 +02:00
Thomas Tanghus
5bddb5377a Purge session from Request - and fix some styles 2013-09-17 18:38:18 +02:00
Thomas Tanghus
5c19b995db Add interface for Session and add getter in server container. 2013-09-17 18:31:14 +02:00
Thomas Tanghus
1a13062701 Add legacy wrapper 2013-09-17 18:02:37 +02:00
Thomas Tanghus
fe86182dac OC_Cache namespace changes and add UserCache to server container. 
Refs #4863
 2013-09-17 17:46:33 +02:00
Thomas Müller
b9e943f5d5 fix naming 2013-09-17 09:42:14 +02:00
Thomas Müller
4cd0ee47a8 Merge branch 'master' into appframework-master 2013-09-17 09:39:45 +02:00
Thomas Müller
822daa8f8a class files have to be lowercase 2013-09-17 00:27:22 +02:00
Thomas Müller
981a41e2cd adding interface for middleware 2013-09-17 00:26:55 +02:00
Thomas Müller
c8f9efeb94 etag changes are now propagated up the file tree 2013-09-16 23:32:17 +02:00
Andreas Fischer
a92d4c2c09 Perform expiration date checking before returning share data for token. 2013-09-16 21:24:17 +02:00
Bart Visscher
9d18e16c77 Merge pull request #4825 from owncloud/fix-sharing-expiration-oracle 
Fix Sharing "Expiration Date" on Oracle
 2013-09-16 12:16:44 -07:00
Thomas Müller
3c026b7cf6 recreate an etag within the scanner if the cache contains an empty etag 2013-09-16 12:09:15 +02:00
Bjoern Schiessle
534d93d2d3 Merge branch 'master' into sharing_mail_notification_master 
Conflicts:
	apps/files/index.php
 2013-09-16 10:40:06 +02:00
Thomas Tanghus
eab84d3d96 Add OCP\DB::getErrorMessage() to public namespace. 2013-09-16 02:17:39 +02:00
Thomas Müller
5d4e9e0d25 /OC/Server has created too early causing issues with config operations as OC:$SERVERPATH was not yet initialized 
This fixes unit test execution
 2013-09-15 23:07:18 +02:00
Thomas Müller
af0069bf03 adding getRootFolder() to server container and hooking up the new files api 2013-09-15 22:24:57 +02:00
Thomas Müller
ad82a56f79 Merge branch 'master' into appframework-master 2013-09-15 21:18:59 +02:00
Thomas Müller
0f4e214a90 adding null check on a mount's storage 2013-09-15 20:40:40 +02:00
Bernhard Posselt
a58e176852 Merge pull request #4506 from owncloud/oc_avatars 
OC Avatars
 2013-09-14 16:00:36 -07:00
Jenkins for ownCloud
556bd1ef23 [tx-robot] updated from transifex 2013-09-13 21:49:24 -04:00
Thomas Müller
4480b0b164 Merge branch 'master' into appframework-master 2013-09-13 23:31:59 +02:00
Thomas Müller
6ff07f7681 Merge pull request #4712 from owncloud/fileapi-foreward 
Provide an implementation of the fileapi for oc6 build on top of the old api
 2013-09-13 14:31:11 -07:00
Thomas Müller
4da8fc6907 Merge branch 'appframework-master' of github.com:owncloud/core into appframework-master 2013-09-13 20:57:18 +02:00
Thomas Müller
5b3388c7c4 Merge branch 'master' into appframework-master 2013-09-13 20:56:49 +02:00
Thomas Müller
049e57ac4a remove unused OC_L10N 2013-09-13 17:41:09 +02:00
Thomas Müller
8c9add4d32 adding TB and GB to OC_Helper::humanFileSize 2013-09-13 17:22:45 +02:00
Thomas Müller
d5ddbfb045 Merge pull request #4719 from owncloud/port_4701_master 
Always check variable type before using readdir to avoid surprises
 2013-09-12 15:44:20 -07:00
Andreas Fischer
786017c247 Register EventSubscriber that resets Oracle's NLS_DATE_FORMAT etc. 2013-09-12 23:43:20 +02:00
Andreas Fischer
7f07d737f8 Create instance of Doctrine\Common\EventManager() in OC_DB. 2013-09-12 23:43:20 +02:00
Robin Appelman
58ed78aa9e cleanup public storage interface a bit 2013-09-12 21:58:32 +02:00
Robin Appelman
c9d2663159 Merge branch 'master' into fileapi-foreward 2013-09-12 21:43:35 +02:00
kondou
c9c5e1b97f Merge branch 'master' into oc_avatars 2013-09-12 07:41:44 +02:00
Thomas Müller
8543951cf9 adding icons for shared folders and external folders 2013-09-12 00:12:20 +02:00
VicDeo
62eeac3390 Merge pull request #4798 from owncloud/fixing-variable-typos-master 
no further comment - which dev did not test this BEFORE submitting the p...
 2013-09-11 05:58:07 -07:00
Jenkins for ownCloud
68015b2761 [tx-robot] updated from transifex 2013-09-11 06:50:06 -04:00
kondou
bf7f94422f Bring another enable_avatars to $_ and fix $thus->$this 2013-09-11 07:11:33 +02:00
Thomas Müller
af2164bbcb no further comment - which dev did not test this BEFORE submitting the pull request? 
which reviewer did not test the pull request?
 2013-09-11 01:23:37 +02:00
Andreas Fischer
a2ade4294c Merge pull request #4472 from owncloud/remove-disconnect 
Remove disconnect function from OC_DB

* owncloud/remove-disconnect:
  Remove disconnect function from OC_DB
 2013-09-10 21:48:56 +02:00
Robin Appelman
2e5ce091f0 add storage backend interface to public namespace 2013-09-10 20:13:47 +02:00
Robin Appelman
9ad7891b4e improve phpdoc for the public files interface 2013-09-10 20:10:25 +02:00
Robin Appelman
e271a55783 move filesystem expceptions to global namespace 2013-09-10 19:44:23 +02:00
Robin Appelman
315344eb9c move public files api to a clearer namespace 2013-09-10 19:34:38 +02:00
Jenkins for ownCloud
72689f643b [tx-robot] updated from transifex 2013-09-10 10:42:16 -04:00
Thomas Müller
63a5409c6e Merge pull request #4757 from owncloud/deleteAll-alias 
change View->deleteAll to an alias of View->rmdir since rmdir works recursive
 2013-09-09 15:08:18 -07:00
Thomas Müller
5e1821f21d Merge pull request #4772 from owncloud/preview_improvements 
oc\preview use avconv instead of ffmpeg
 2013-09-09 12:32:45 -07:00
kondou
1832eb8872 Pass view in \OC_Avatar to constructor and use $_ for enable_avatars 2013-09-09 16:57:46 +02:00
Jenkins for ownCloud
92f6c3bb10 [tx-robot] updated from transifex 2013-09-08 21:37:53 -04:00
Robin Appelman
46a57a9f05 change View->deleteAll to an alias of View->rmdir since rmdir works recursive 2013-09-07 14:10:51 +02:00
Jenkins for ownCloud
e895cf9188 [tx-robot] updated from transifex 2013-09-07 04:46:57 -04:00
Robin Appelman
2e1b534957 update phpdoc for public fileapi 2013-09-06 20:55:47 +02:00
Robin Appelman
0131a32025 extract interfaces from fileapi for public namespace 2013-09-06 20:38:59 +02:00
Robin Appelman
1cfd03771f use === 2013-09-06 20:20:17 +02:00
Bjoern Schiessle
b8241aa79d remove some more debug output 2013-09-06 16:07:54 +02:00
Bjoern Schiessle
edb78c917c remove some error_logs 2013-09-06 16:07:45 +02:00
Bjoern Schiessle
d33fabd02d remove error logs 2013-09-06 16:07:25 +02:00
Bjoern Schiessle
627b6164c4 if the files doesn't exist yet we start with the parent to search for shares 2013-09-06 16:07:07 +02:00
Thomas Müller
e9849270e3 Revert "fixes #4574" 
This reverts commit 81a45cfcf1.
 2013-09-06 00:28:13 +02:00
kondou
221bbd275c Use \OC_App for checking whether encryption is enabled 2013-09-05 23:26:02 +02:00
Bjoern Schiessle
f8563ec583 Merge branch 'master' into sharing_mail_notification_master 
increased version number to trigger db update

Conflicts:
	lib/util.php
 2013-09-05 13:39:45 +02:00
Jenkins for ownCloud
0527fb05ad [tx-robot] updated from transifex 2013-09-05 07:37:32 -04:00
Arthur Schiwon
c01675de5d more is_resource checks before readdir 2013-09-05 11:58:57 +02:00
Georg Ehrke
2954db165b use avconv instead of ffmpeg 2013-09-05 09:53:35 +02:00
Bernhard Posselt
fbedd643f7 Merge pull request #4477 from owncloud/hooks-view 
also emit hooks for views that are a subfolder of the user folder
 2013-09-04 16:09:22 -07:00
Thomas Müller
7618cf3005 adding public interface for preview 2013-09-04 23:45:11 +02:00
Thomas Müller
835f477d8f Merge branch 'master' into appframework-master 2013-09-04 23:15:17 +02:00
kondou
b643c02bd5 Fix some bugs and remove \OCP\Avatar for now 2013-09-04 22:13:59 +02:00
Thomas Müller
68dce9dde5 fixing style, var name & PHPDoc 2013-09-04 21:22:36 +02:00
Arthur Schiwon
ec3639dc7a Always check variable type before using readdir to avoid surprises 2013-09-04 13:06:04 +02:00
kondou
820fd42161 Merge branch 'master' into oc_avatars 2013-09-04 12:56:40 +02:00
Thomas Tanghus
823b4cce60 More trimming 2013-09-04 08:16:27 +02:00
Morris Jobke
09187f3b3b Merge pull request #4449 from owncloud/clean_up_util 
Clean up \OC\Util
 2013-09-03 22:53:03 -07:00
Jenkins for ownCloud
fe0b8ac2c0 [tx-robot] updated from transifex 2013-09-03 07:46:55 -04:00
Bjoern Schiessle
fd7469db9e coding-style fixes 2013-09-03 13:37:06 +02:00
kondou
65413a95dc Merge branch 'master' into oc_avatars 
Conflicts:
	config/config.sample.php
 2013-09-03 04:43:11 +02:00
blizzz
431cf06e99 Merge pull request #4672 from owncloud/ocs_cleanup 
Ocs cleanup
 2013-09-02 14:24:46 -07:00
kondou
e7e3f1b81a Fix some of @jancborchardt's complaints in oc_avatars 2013-09-02 17:07:38 +02:00
Bjoern Schiessle
931e90634e fix db queries 2013-09-02 17:03:35 +02:00
Bjoern Schiessle
983da0d78f fix db queries 2013-09-02 17:01:10 +02:00
Bjoern Schiessle
b918c06be6 Merge branch 'master' into sharing_mail_notification_master 
Conflicts:
	lib/util.php
 2013-09-02 14:41:46 +02:00
Jörn Friedrich Dreyer
06870a6e39 Merge pull request #4673 from owncloud/ocsapi_cleanup 
remove the activity call here. it is not implemented anyways.
 2013-09-02 01:46:29 -07:00
kondou
e5fc7b9dbe Merge branch 'master' into clean_up_util 
Conflicts:
	lib/base.php
 2013-09-02 07:58:06 +02:00
kondou
74c9223281 Properly check for tmpavatar, invalidate cache, fix debug msgs 2013-09-01 21:17:48 +02:00
Robin Appelman
a22f9ff301 Provide an implementation of the fileapi for oc6 build on top of the old api 2013-09-01 19:47:48 +02:00
Jenkins for ownCloud
e68b5f8b0d [tx-robot] updated from transifex 2013-09-01 13:30:40 -04:00
kondou
76b1b5b6a3 Provide 'enable_avatars' in config.php, to disable avatars 2013-09-01 18:17:14 +02:00
kondou
ab70b8c26e Merge branch 'master' into oc_avatars 2013-09-01 17:52:13 +02:00
Christopher
36424580b0 Merge pull request #4329 from owncloud/fix_4258 
Fix #4258 and improve unittest
 2013-09-01 08:46:27 -07:00
Bart Visscher
0aba549e7f Use more object oriented way for console commands 2013-09-01 16:40:50 +02:00
kondou
2d6a400381 Check for $this->fileInfo and @depend on testData() 2013-09-01 15:50:58 +02:00
Frank Karlitschek
c54994d2e9 fixing this obvious typo directly 2013-09-01 08:23:11 +02:00
kondou
235638e5ab Merge branch 'master' into fix_4258 
Conflicts:
	lib/image.php
 2013-08-31 23:48:23 +02:00
Thomas Müller
206f83941b move new interfaces into lib/public and OCP 2013-08-31 21:34:29 +02:00
Thomas Müller
97bdf008b1 PHPDoc added to existing interfaces 2013-08-31 20:57:16 +02:00
Frank Karlitschek
f1836a997f remove the activity call here. it is not implemented anyways. This will be provided by Activity app in the future. 2013-08-31 18:14:46 +02:00
Frank Karlitschek
58e036e304 remove knowledgebase calls that are no longer used in ownCloud 5/6 2013-08-31 18:00:53 +02:00
kondou
5d653753bd Merge branch 'master' into oc_avatars 2013-08-31 12:56:36 +02:00
Thomas Müller
ec9b7d1e84 fixing file header 2013-08-31 01:41:24 +02:00
Thomas Müller
a9d6b59307 Merge branch 'master' into appframework-master 2013-08-31 01:38:44 +02:00
kondou
0869f9b655 Fix #4258, clean up \OC_Image and improve its unittest 2013-08-30 21:08:37 +02:00
Georg Ehrke
8ef40277b2 Merge master into oc_preview 2013-08-30 18:11:18 +02:00
Jan-Christoph Borchardt
0f5df181a3 Merge pull request #4661 from owncloud/separate-app-styles 
Move CSS for apps and browser-specific fixes out of main styles.css
 2013-08-30 09:08:25 -07:00
Bjoern Schiessle
4bbefdf608 add expiration date if it is already set 2013-08-30 17:20:10 +02:00
Bjoern Schiessle
10cf1b3a4e return mailSend status in getItems() 2013-08-30 15:39:43 +02:00
Jenkins for ownCloud
dbc78b1a58 [tx-robot] updated from transifex 2013-08-30 09:38:20 -04:00
Stephane Martin
95f42d6544 Merge pull request #4578 from houbaastef/master 
fixes #4574
 2013-08-30 06:20:07 -07:00
Bjoern Schiessle
77adaee645 enable user to inform recipients about a shared file by mail 2013-08-30 13:53:49 +02:00
kondou
30526ded80 Fix \OCP\Avatar 2013-08-30 13:26:13 +02:00
Arthur Schiwon
7d398ba622 Use the real username in preferences and magic cookie instead of case-insensitive user input. Fixes 4616. 2013-08-30 11:45:16 +02:00
Jan-Christoph Borchardt
9c23ed580a move CSS for browser-specific fixes out of styles.css into new fixes.css 2013-08-30 11:42:32 +02:00
Jan-Christoph Borchardt
cc8e19ad11 move CSS for apps out of styles.css into new apps.css 2013-08-30 11:38:49 +02:00
kondou
ecf187393b Finish cropper, Get rid of TODOs, Improve \OCP\Avatar and "fix" unitests 2013-08-30 09:00:37 +02:00
Thomas Müller
0104d3df96 Merge pull request #4592 from owncloud/fix-logic 
fix weird logical behaviour
 2013-08-29 08:40:33 -07:00
Thomas Müller
14b67d6c5f fixing typo 2013-08-29 16:25:25 +02:00
Georg Ehrke
728fc7f123 fix parameter missing warning 2013-08-29 16:13:16 +02:00
Robin Appelman
1fa29b4c11 also emmit create hook when creating new files using touch() 2013-08-29 15:31:03 +02:00
kondou
0c708be76b Use defaultavatars 2013-08-29 14:26:11 +02:00
Thomas Müller
301cce54cc webdav quota information contains the values for used and free - not total 2013-08-29 12:34:48 +02:00
Georg Ehrke
b7758d0f8d Merge master into oc_preview 2013-08-29 10:50:55 +02:00
Georg Ehrke
70b6e2161e invert logic of disable_previews 2013-08-29 10:08:53 +02:00
kondou
0ba498119c Merge branch 'master' into oc_avatars 
Conflicts:
	3rdparty
 2013-08-28 23:21:26 +02:00
kondou
bdf48a6daa Use OC.Router.generate, TODO use cache, prepare for defaultavatars 2013-08-28 21:20:28 +02:00
Morris Jobke
d4952bd9df fix typo 2013-08-28 18:36:32 +02:00
Bart Visscher
3fd2df4088 Only enable logrotate when configured. Also rotate size is settable. 2013-08-28 17:41:27 +02:00
Bart Visscher
42f3ecb60f Check for installed state before registering the logrotate background job 2013-08-28 17:11:43 +02:00
Bart Visscher
62560ef859 Add description to log rotate class 2013-08-28 17:11:43 +02:00
Bart Visscher
594a2af75a Review fixes 2013-08-28 17:11:43 +02:00
Bart Visscher
b5e2842e00 Very simple log rotation 2013-08-28 17:11:43 +02:00
kondou
67c5be9f19 Merge branch 'master' into oc_avatars 
Conflicts:
	3rdparty
 2013-08-28 16:44:11 +02:00
kondou
8d8a57de7f Continue work on cropper 2013-08-28 16:39:00 +02:00
Bart Visscher
45076edf4f Merge pull request #3891 from owncloud/fix_loadAppScriptFile 
Check if the app is enabled and the app path is found before trying to l...
 2013-08-28 06:10:06 -07:00
Thomas Tanghus
9843c8e838 Merge pull request #4434 from owncloud/fix_octemplate_escaping 
Fix octemplate string escaping.
 2013-08-28 03:59:43 -07:00
Jenkins for ownCloud
3e7ddbc9d9 [tx-robot] updated from transifex 2013-08-28 06:24:14 -04:00
Jenkins for ownCloud
d5062b9e0e [tx-robot] updated from transifex 2013-08-27 11:23:18 -04:00
Morris Jobke
e91edabe0f add documentation 2013-08-27 16:07:25 +02:00
Tom Needham
273f162b26 Code style 2013-08-27 15:39:47 +02:00
Tom Needham
f14ce1efdc Add quota to core api 2013-08-27 15:39:43 +02:00
Jörn Friedrich Dreyer
13514fd1ad Merge pull request #4348 from owncloud/fixing-4343-master 
fixes #4343
 2013-08-27 04:26:51 -07:00
blizzz
163269805a Merge pull request #4507 from owncloud/existingusersfromgroup 
return only existing users in group
 2013-08-27 03:47:56 -07:00
Morris Jobke
ea446544ef Merge pull request #4586 from owncloud/fixing-3431-master 
kill zh_CN.GB2312
 2013-08-27 02:00:48 -07:00
Morris Jobke
6e8bc13aa3 fix weird logical behaviour 2013-08-27 10:58:17 +02:00
Thomas Müller
d3d91ce347 revert debugging code which accidentially entered this pull request 2013-08-27 10:49:10 +02:00
Thomas Müller
c9123263ab kill zh_CN.GB2312 2013-08-27 01:27:05 +02:00
Thomas Müller
8cf9336bcb storage information is path specific 2013-08-27 00:59:58 +02:00
Thomas Müller
1e4ebf47e2 webdav quota now displays the same values as the web interface does 2013-08-27 00:57:28 +02:00
Thomas Müller
21fd352c1a as a quick example the public contacts API has been ported over as a service hosted within the server container 2013-08-26 23:48:18 +02:00
Thomas Müller
a995e81686 Merge branch 'master' into appframework-master 2013-08-26 21:31:15 +02:00
Thomas Müller
d1a6d2bc8f lacy initialization of fileView - in case basic auth is used FileSystem is not yet initialized during the initialize() call 2013-08-26 20:21:16 +02:00
Morris Jobke
7d141656ee Merge branch 'xsendfile_complete_zip_fix' of github.com:riso/owncloud-core into riso-xsendfile_complete_zip_fix from pull request #3307 
Conflicts:
	lib/helper.php
 2013-08-26 18:04:49 +02:00
Arthur Schiwon
1f5a55ddff consolidate validity check for users in group class 2013-08-26 17:46:31 +02:00
kondou
e6473e6d49 Clean up some cruft 2013-08-26 17:41:19 +02:00
kondou
31736a1df3 Have a controller instead ofo avatar.php and fix some cropper-design 2013-08-26 16:46:55 +02:00
Stephane Martin
81a45cfcf1 fixes #4574 2013-08-26 15:16:41 +02:00
Georg Ehrke
6f0c1e8d45 Merge master into oc_preview 2013-08-26 12:24:33 +02:00
Jenkins for ownCloud
d587146a5a [tx-robot] updated from transifex 2013-08-25 19:21:52 -04:00
kondou
9a8908b643 Use Jcrop, have inline errormsg, work on cropping, clean up, WIP 2013-08-25 21:06:44 +02:00
kondou
5eb17aadb3 Fix spacing, have remove() and return JSON for custom-default-avatars 2013-08-25 21:06:02 +02:00
kondou
81cadd5ea3 Remove gravatar and no-avatar functionality, prepare for default avatars even more and reword some stuff 2013-08-25 21:06:02 +02:00
kondou
4a9c89fb33 Clean up and prepare a bit for custom default avatars 2013-08-25 21:06:01 +02:00
kondou
9c12da6a94 Several improvements 
- Don't use gravatars default avatars
- Use "profile image" instead of "avatar"
- Use <p> instead of tables
- Ease updateAvatar()
- Actually return something in \OCP\Avatar
 2013-08-25 21:05:40 +02:00
kondou
9500109349 Refactor newavatar.php and show (for now) an alert on problems when setting new avatars 2013-08-25 21:05:40 +02:00
kondou
4521b54c67 Have /avatar.php as a central avatar-point 2013-08-25 21:04:49 +02:00
kondou
252548c62c Improve styling & enable avatar-upload at personal page 2013-08-25 21:04:45 +02:00
kondou
a58d270684 Load avatar from path, if one's provided 2013-08-25 21:04:09 +02:00
kondou
2bfe662235 Add unittests & check filetype in setLocalAvatar() 
TODO: Fix OC_Image->mimetype(), it always returns "image/png"
 2013-08-25 21:04:09 +02:00
kondou
fac671b14e Modularize get(), async getAvatar, avatars @ usermgmt 
And other small improvements
 2013-08-25 21:04:04 +02:00
kondou
4a08f7d710 Add basic avatars and gravatar 2013-08-25 21:02:43 +02:00
Christopher
b8965c6107 Merge pull request #4331 from owncloud/improve_app-management 
Improve app-management
 2013-08-25 11:56:56 -07:00
Jenkins for ownCloud
596ac40b7f [tx-robot] updated from transifex 2013-08-23 20:17:08 -04:00
Georg Ehrke
58c727a495 fix return value of method 2013-08-23 23:27:36 +02:00
Georg Ehrke
6ffa2a28d0 Merge branch 'master' into oc_preview 2013-08-23 23:10:37 +02:00
Georg Ehrke
1dab076750 make it possible to disable previews 2013-08-23 23:05:44 +02:00
kondou
8dd93c8c02 Fix some phpdoc and camelcase 2013-08-23 07:30:42 +02:00
Thomas Müller
9e1016f7d2 Merge branch 'master' into fixing-4343-master 
Conflicts:
	lib/connector/sabre/quotaplugin.php
 2013-08-22 17:59:39 +02:00
Jenkins for ownCloud
02b2b5a808 [tx-robot] updated from transifex 2013-08-22 10:37:23 -04:00
Thomas Müller
1c258087c9 fixing typos 2013-08-22 01:20:28 +02:00
Thomas Müller
fbc23c4a01 Merge branch 'master' of github.com:owncloud/core 2013-08-22 00:18:14 +02:00
Thomas Müller
f1eec74f70 additional readdir check in mappedlocal 2013-08-22 00:17:08 +02:00
Arthur Schiwon
958130e8fe Sharing: only determine path root if owner is available 2013-08-22 00:00:40 +02:00
kondou
0ce35af02a Merge branch 'master' into improve_app-management 
Conflicts:
	settings/js/apps.js
 2013-08-21 19:20:25 +02:00
Jenkins for ownCloud
a89199cc7b [tx-robot] updated from transifex 2013-08-21 08:14:27 -04:00
Thomas Müller
38f9df4293 introducing OCP\AppFramework\App 2013-08-21 01:02:15 +02:00
Thomas Müller
911bd3c16f moving response classes over to OCP 2013-08-21 01:00:26 +02:00
Thomas Müller
e39083c36f typo 2013-08-21 00:58:33 +02:00
Thomas Müller
ba029ef4b2 initial setup of the server container 2013-08-21 00:58:15 +02:00
Thomas Müller
395deacc67 reducing controller annotations to: 
@PublicPage - No user logon is expected
@NoAdminRequired - the login user requires no admin rights
@NoCSRFRequired - the incoming request will not check for CSRF token
 2013-08-20 21:21:21 +02:00
Thomas Müller
25ebe495b8 controller reuses IRequest methods 2013-08-20 21:05:55 +02:00
Thomas Müller
f115b94927 Introducing IRequest 2013-08-20 17:53:58 +02:00
Thomas Müller
6e1946ab00 Introducing IContainer into public api 2013-08-20 17:22:33 +02:00
Thomas Müller
93194bb396 Introducing IContainer into public api 2013-08-20 17:21:14 +02:00
Thomas Müller
cdada78aa4 typos & unused var fixed 2013-08-20 17:20:36 +02:00
kondou
f1518a54df Merge branch 'master' into clean_up_util 
Conflicts:
	lib/util.php
 2013-08-20 17:20:30 +02:00
Thomas Müller
0fa2e1b3d9 there is no HttpMiddleware 2013-08-20 12:48:45 +02:00
Thomas Müller
72e1a8d83b fixing require to Pimple 2013-08-20 12:47:23 +02:00
Thomas Müller
884c6b5a82 Merge pull request #4512 from owncloud/readdir-strict-equals 
use strict equals in readdir loops to prevent issues with '0' files
 2013-08-20 01:17:25 -07:00
Jenkins for ownCloud
e9644c2f52 [tx-robot] updated from transifex 2013-08-19 15:14:38 -04:00
Georg Ehrke
cbeccb2fcd Merge branch 'master' into readdir-strict-equals 2013-08-19 17:30:56 +02:00
Arthur Schiwon
64c0e5d807 no assoc index here, makes tests pass again 2013-08-19 15:53:20 +02:00
icewind1991
d7dde3cfbc Merge pull request #4467 from owncloud/storage-wrapper-quota 
Move quota logic from filesystem proxy to storage wrapper
 2013-08-19 03:38:55 -07:00
Georg Ehrke
48f0c54261 style fixes for preview lib 2013-08-19 12:16:55 +02:00
Robin Appelman
c5402f4575 use strict equals in readdir loops to prevent issues with '0' files 2013-08-19 12:04:53 +02:00
Arthur Schiwon
0f7fad7166 return only existing users in group 2013-08-19 11:48:21 +02:00
Georg Ehrke
f2702ff1ca Merge master into oc_preview 2013-08-19 11:24:17 +02:00
Björn Schießle
9be836814c Merge pull request #4239 from owncloud/decrypt_files_again 
Enable user to decrypt files again after encryption app was disabled
 2013-08-18 09:51:48 -07:00
Kondou
c7af26ec84 Merge pull request #4497 from owncloud/newlines_at_eof_kondou 
Add newlines at the end of files
 2013-08-18 07:16:15 -07:00
Thomas Tanghus
3366bbeb8a Port DAV groupMemberSet fix to master #4458 2013-08-18 15:54:56 +02:00
kondou
9f4bd7cb47 Don't use an alert for displaying app-mgmt-errors 
Rather display a dominant div and mark the problematic app in the applist.

Fix #305
 2013-08-18 13:49:34 +02:00
Markus Goetz
ba430a7dfa Merge pull request #4485 from guruz/class_autoloader_optimization 
Class Auto Loader: Cache paths in APC
 2013-08-18 03:32:13 -07:00
Markus Goetz
aba64a0b81 Class Auto Loader: Cache paths in APC 
Using benchmark_single.php (from administration repo) I can
measure a speed improvement of 5% to 20% loading the /index.php
when logged in. (when using APC and php-fpm).
 2013-08-18 12:29:43 +02:00
kondou
c741a25eaa Merge branch 'master' into improve_app-management 2013-08-18 12:15:22 +02:00
Robin Appelman
d8c71ba734 merge master in storage-wrapper-quota 2013-08-18 11:34:56 +02:00
kondou
9e8a6b704d Add _many_ newlines at the end of files 2013-08-18 11:06:59 +02:00
kondou
65d802329f Fix some naming and spacing in lib/util.php 2013-08-18 10:33:09 +02:00
Thomas Müller
12f4494de0 Merge pull request #4339 from owncloud/mimetype-defaults 
Add the option to provide templates for newly created files
 2013-08-17 08:42:49 -07:00
Bjoern Schiessle
cabe92ef12 Merge branch 'master' into decrypt_files_again 
Conflicts:
	apps/files_encryption/tests/keymanager.php
 2013-08-17 13:15:22 +02:00
Thomas Müller
de52157e76 remove ru_RU - fixes #3135 2013-08-17 11:43:37 +02:00
Thomas Müller
fde9cabe97 initial import of appframework 2013-08-17 11:16:48 +02:00
Robin Appelman
d43b4c52ae also emit hooks for views that are a subfolder of the user folder 2013-08-17 10:57:31 +02:00
Bart Visscher
a0b7bf78a6 Remove disconnect function from OC_DB 2013-08-16 19:05:07 +02:00
Robin Appelman
5c9aedac1b remove outdated quota proxy 2013-08-16 15:50:50 +02:00
Robin Appelman
8f10c9571f fix quota wrapper reporting negative free_space, breaking user interface 
return 0 instead
 2013-08-16 15:48:45 +02:00
Jan-Christoph Borchardt
1e8849b04e Merge pull request #4314 from owncloud/css-fixes 
Design fixes
 2013-08-16 01:05:29 -07:00