Thomas Müller
|
e31f6c01e8
|
fixing PHPDoc
|
2013-09-20 21:43:17 +02:00 |
Thomas Müller
|
9116303cfc
|
fixing typos
|
2013-09-20 21:40:54 +02:00 |
Bart Visscher
|
e92abfd4d8
|
Add Config container class to server container
|
2013-09-20 20:21:24 +02:00 |
Bart Visscher
|
e3013c5801
|
Add Navigation class to server container
|
2013-09-20 20:20:01 +02:00 |
Bart Visscher
|
aa8a85f77d
|
Add DBConnection to server container
|
2013-09-20 14:33:45 +02:00 |
Bart Visscher
|
ac73ce1b2a
|
Add UserSession to server container
|
2013-09-20 14:32:43 +02:00 |
Thomas Müller
|
69c28400b4
|
Merge pull request #4886 from owncloud/public_cache
Public cache etc.
|
2013-09-18 13:29:35 -07:00 |
Thomas Müller
|
1274d6116d
|
updating php docs
|
2013-09-18 22:22:51 +02: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
|
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 Müller
|
415a27c1ae
|
Merge pull request #4888 from owncloud/public_session
Public session
|
2013-09-18 03:10:42 -07:00 |
Thomas Tanghus
|
d3f88ceeb4
|
Add some docs to the sessions interface.
|
2013-09-18 12:01:01 +02:00 |
Thomas Tanghus
|
8b4f4a79e2
|
Still some session leftovers.
|
2013-09-17 19:46:08 +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
|
9b420e8660
|
use \OC::$server->getPreviewManager() instead of \OCP\Preview
|
2013-09-17 13:33:47 +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 |
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 |
Jenkins for ownCloud
|
5cf12888ad
|
[tx-robot] updated from transifex
|
2013-09-16 11:38:45 -04:00 |
Thomas Müller
|
46f59b165e
|
Merge pull request #4838 from owncloud/refactor_upload_js
refactor upload js & html to always use only js to fill form data
|
2013-09-16 01:06:24 -07:00 |
Thomas Müller
|
c20f01bbf0
|
Merge pull request #4862 from owncloud/db_to_public
Add OCP\DB::getErrorMessage() to public namespace.
|
2013-09-16 00:51:12 -07: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 |
icewind1991
|
da0631e185
|
Merge pull request #4860 from owncloud/fixing-potential-null-storage-on-scanner-master
adding null check on a mount's storage
|
2013-09-15 13:47:16 -07: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
|
5acb3c4c0d
|
first log the exception
|
2013-09-15 21:20:22 +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 |
Morris Jobke
|
339c98e5e6
|
Merge pull request #4835 from owncloud/fix-apps-height
use lineheight instead of padding and height
|
2013-09-15 07:08:50 -07:00 |
Morris Jobke
|
58e6582056
|
Merge pull request #4803 from owncloud/fix-4465-add-share-user-on-enter
Fixes #4465 - Added autoFocus to #shareWith autocomplete options
|
2013-09-15 03:07:11 -07:00 |
Thomas Müller
|
db7e1dd877
|
Merge pull request #4853 from owncloud/external-shared_mimetype-icons
Use external and shared icons in OC.Dialogs.filepicker()
|
2013-09-15 02:42:14 -07:00 |
Bernhard Posselt
|
a58e176852
|
Merge pull request #4506 from owncloud/oc_avatars
OC Avatars
|
2013-09-14 16:00:36 -07:00 |
Thomas Müller
|
a0c2c2473a
|
Merge pull request #4501 from owncloud/ajaxfilelist
Ajax calls for "files" and "files_trashbin" apps
|
2013-09-14 12:51:16 -07:00 |
Thomas Tanghus
|
dcc899d0a0
|
Merge pull request #4806 from owncloud/oc-dialogs-pageleave
Don't popup meaningless alerts when dialog called on page leave
|
2013-09-14 10:35:39 -07:00 |
kondou
|
c117e719da
|
Use external and shared icons in OC.Dialogs.filepicker()
|
2013-09-14 14:35:23 +02:00 |
kondou
|
86143beb6a
|
Remove superfluous $
|
2013-09-14 14:15:52 +02: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
|
6eeb4d165c
|
- giving the user a new id for each test run in order to prevent reuse of e.g. permissions data in the database
- setting the current user id because \OC\FilesView relies on \OC_User::getUser()
|
2013-09-13 21:44:31 +02:00 |
Vincent Petry
|
ec2f20f720
|
Fixed files_trashbin to also use hash URL part for IE8
|
2013-09-13 21:00:15 +02: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 |