14f7daf53c
add transitions to oc_db
2011-07-31 20:24:53 +02:00
17058c9467
Merge branch 'master' into sharing
2011-07-31 12:53:34 -04:00
b93b066a42
fix search results having files from other users
2011-07-31 15:35:37 +02:00
5ef407d1c9
keyboard shortcuts for search results
2011-07-31 04:03:48 +02:00
2c8b4da840
make sure jquery and common javascript is loaded before the javascript of the apps
2011-07-31 02:24:46 +02:00
0bc16683e5
dont show music results twice
2011-07-31 02:20:34 +02:00
0d3ebbfefd
Merge branch 'master' into sharing
2011-07-30 19:57:57 -04:00
11d1627513
Merge branch 'master' into sharing. Integrate with changes in master, rename classes
...
Conflicts:
lib/base.php
2011-07-30 19:40:19 -04:00
1564a40538
dont show the full path for the files in search results
2011-07-31 01:26:13 +02:00
0503c3499e
configure users/groups before loading apps
2011-07-31 00:23:06 +02:00
0dab7f2e53
laod apps ways earlier!
2011-07-31 00:06:17 +02:00
aafd36e2f3
provide json interface for search
2011-07-30 16:42:20 +02:00
bafd684eb6
Renaming classes :-)
2011-07-29 21:36:03 +02:00
2ff8d7a8bc
One class per file!
2011-07-29 21:03:53 +02:00
2bfad189e7
Merge branch 'master' of git://anongit.kde.org/owncloud into autoload
...
Conflicts:
lib/base.php
lib/filestorage.php
2011-07-29 20:42:24 +02:00
5fd77084c4
Merge branch 'master' into sharing
...
Conflicts:
core/templates/layout.user.php
2011-07-29 13:58:13 -04:00
d12d08e2f3
some more changes for navigation subentries
2011-07-29 19:43:06 +02:00
fe47d51598
some refactoring for subnavigation code
2011-07-29 19:12:55 +02:00
fcc9f50641
Merge branch 'master' into sharing
...
Conflicts:
files/templates/index.php
2011-07-29 10:23:15 -04:00
6d0c8ea7e4
use proper file icons for image and audio files
2011-07-29 01:37:08 +02:00
f1616b0e62
implemented relative file size and coloring
2011-07-29 00:46:20 +02:00
f1c2b5b304
set installed version in config file
2011-07-28 23:34:39 +02:00
20f5a9f085
bumb version number for upcomming beta
2011-07-28 23:34:39 +02:00
7d15a45e09
use oc_preferences to store ocs privatedata
2011-07-28 20:23:58 +02:00
0d408fe6f5
make use of the command line tools id3info and mp3info for scanning music if they are available
2011-07-28 20:10:58 +02:00
7505720350
fix log when no tablename prefix is used
2011-07-27 22:44:51 +02:00
e69079f935
Further improvements
2011-07-27 20:04:42 +02:00
924100dd8c
One class per File
2011-07-27 19:52:24 +02:00
f5c0dbd947
Use autoload
2011-07-27 19:07:28 +02:00
ff3140052a
Merge branch 'master' into sharing
2011-07-26 21:29:44 -04:00
98cd83fabd
bumb jquery and jquery-ui versions
2011-07-25 23:16:05 +02:00
edec37b402
add OC_APP::getCurrentApp() to get the id of the active app
2011-07-25 20:25:53 +02:00
9a989a284a
fix sabredav for sqlite2
2011-07-25 03:14:22 +02:00
415ae8e40a
Merge branch 'master' into sharing
2011-07-24 16:08:39 -04:00
3097e4f48a
Merge branch 'sabredav'
2011-07-22 23:18:08 +02:00
ccc94819e2
Merge branch 'sabredav' of git://anongit.kde.org/owncloud into sabredav
2011-07-22 23:16:43 +02:00
5416c0e6f8
Remove HTTP_Webdav
2011-07-22 23:16:14 +02:00
18a36be28c
fix problem with removing locks
2011-07-22 23:06:53 +02:00
3b92ec12c2
Properties work fine now
2011-07-22 22:30:45 +02:00
5851da47f1
properties nearly work
2011-07-22 16:21:29 +02:00
7c9f356abe
Support for locks, minor changes
2011-07-22 14:38:42 +02:00
0387cc5f1f
Merge branch 'master' into sharing
2011-07-21 19:18:26 -04:00
f441059b01
add getLocalFile to local storage provider
2011-07-22 06:29:45 +02:00
8eefd42a7d
only remove old sqlite database if it exists
2011-07-21 00:52:48 +02:00
6af4c465b8
Change all occurences of ['user_id'] to OC_USER::getUser()
2011-07-20 16:52:01 -04:00
1cfa911ce3
Update database.xml to current database fields, remove hard coded MTGap when mounting shared storage provider
2011-07-20 14:42:48 -04:00
abf6ba621a
Merge branch 'master' into sharing
2011-07-20 14:30:19 -04:00
86cd8063b4
Use SabreDAV authentication Code!
2011-07-20 16:36:36 +02:00
bf1ca75710
Integration of SabreDAV
2011-07-20 15:53:34 +02:00
c5776fdae4
remember login added
2011-07-20 15:04:14 +02:00
6935f036a5
move list of mimetypes by extention to a seperate file.
2011-07-17 17:41:46 +02:00
f09f2d3290
Fix typo in setup, thanks for pointing it out ab0oo
2011-07-13 17:19:13 -04:00
ecaf66ee97
Add missing argument for fromTmpFile() inside of rename()
2011-07-13 13:47:45 -04:00
5896e48755
Add missing argument for fromTmpFile() inside of rename()
2011-07-13 13:30:22 -04:00
a79f2535f8
Merge branch 'master' into sharing
2011-07-12 20:51:07 -04:00
a861666500
Add missing parameter for fromTmpFile() inside of copy()
2011-07-12 20:50:04 -04:00
2c4fef91da
Merge branch 'master' into sharing
2011-07-12 18:38:03 -04:00
f8eced1960
Fix post_create and post_write hooks in copy(), was referencing an undefined variable
2011-07-12 18:26:44 -04:00
6b303ee64b
Fix bug in opendir() and remove getStorageMountPoint(), now using datadir argument instead
2011-07-12 13:10:29 -04:00
5e560e9bd9
Merge branch 'master' into sharing
2011-07-06 20:19:44 -04:00
e3fd72dc16
introducing simple file size, only MB as unit, details on hover
2011-07-07 01:27:16 +02:00
9deab8302f
Fix bugs in getSource() and implement new target path standard
2011-07-05 11:56:02 -04:00
607f1a2738
Fix conflicts with master in lib/base.php
2011-07-04 16:45:19 -04:00
05389827fd
Merge branch 'master' into sharing
...
Conflicts:
.gitignore
lib/base.php
2011-07-04 16:36:30 -04:00
f2845bbea8
Fix to make the Unlock mechanism of WebDAV work. Previously when using unlock in cadaver etc was used the lock entry corresponding to the file was not deleted in the sqlite database table oc_locks. The error was because the delete query in the Unlock function was not getting executed :)
2011-07-02 07:17:05 +05:30
f40a1cad8b
not all http server add index.php to $_SERVER[SCRIPT_NAME], do it manually
...
this fixes incorect generated links in some cases
2011-06-26 00:59:31 +02:00
155f62bcf6
allow plugins/apps to add custom headers to all pages
2011-06-24 22:09:55 +02:00
2098cbd822
redirect_url to be respected in linkTo function
2011-06-25 01:14:28 +05:30
4d11e920be
provide an option to add custom elements to the header of templates
2011-06-24 18:02:19 +02:00
467778d66f
Merge branch 'master' into sharing
2011-06-23 17:54:49 -04:00
2073d3b08e
fix 404
2011-06-23 23:47:46 +02:00
0bf67298d1
no indexing in generated htaccess
2011-06-23 23:41:53 +02:00
8b76590f5d
fix creating users
2011-06-23 18:23:47 +02:00
3b2fcd356f
Use new user backend API
2011-06-23 15:24:09 +02:00
96657f8b62
Detect backend features dynamically instead of trial-and-error usage
...
Move documented functions for reference into OC_USER_EXAMPLE class.
2011-06-23 14:45:28 +02:00
18e776fa2f
Changed mount point to 'Share', fixed is_dir()
2011-06-22 11:40:09 -04:00
83958ebd4b
add oc_user::getUser to get the user id of the loggedin user
2011-06-22 12:50:57 +02:00
36dbb8edab
prefix the mysql user name to avoid collissions
2011-06-21 23:58:02 +02:00
e047feb2ad
install shipped apps also in "installed apps" page
2011-06-21 22:17:53 +02:00
ee0f1490e1
Multiply changes to user system
...
keeping tracked of the logged in user is no longer done by the active backend but by oc_user directly instead
multiply backends can be active at the same time, allowing alternative authentication procedures like openid or tokens to be used next to the regular user system
2011-06-21 19:28:46 +02:00
3e74cca739
Merge branch 'master' of git://anongit.kde.org/owncloud
2011-06-20 22:09:21 +02:00
61993419ec
New i18n-structure
2011-06-20 21:54:21 +02:00
0603391405
fixed page reload after logout
2011-06-20 21:09:34 +02:00
eb1ce7819a
Fix linkTo()
2011-06-20 21:01:34 +02:00
91c37bbb76
moved core stuff to /core
2011-06-20 20:29:30 +02:00
272fc252fb
Activate "active" for subentries
2011-06-20 19:50:25 +02:00
0563741652
fix sqlite3 driver for php<5.3
2011-06-20 19:04:31 +02:00
76b12c4ae0
add settings option for language
2011-06-20 14:33:31 +02:00
99ae7cd477
Autodetection of language is working now
2011-06-19 23:46:59 +02:00
ad893f2bea
Merge branch 'master' of git://anongit.kde.org/owncloud
2011-06-19 23:34:03 +02:00
b31a8ac985
More l10n-stuff
2011-06-19 23:33:34 +02:00
38545d5ee4
and even more properly now ;P
2011-06-19 23:29:09 +02:00
51c0a8e3ce
index now properly reloaded after setup
2011-06-19 23:12:07 +02:00
ee247a21a4
shipped apps are no longer hardcoded
2011-06-19 22:46:05 +02:00
37f9e03772
improved check in oc_preferences if a key already exists
2011-06-19 22:34:36 +02:00
11dc3bb0e1
only load apps if they exist
2011-06-19 22:34:36 +02:00
07f2fcf7ec
add post_* hooks to filesystem for write, create, delete, rename and copy
2011-06-19 22:34:36 +02:00
c26719a10d
Fixed documentation of OC_L10N
2011-06-19 19:38:51 +02:00
e8e483d079
L10N is here ;-)
2011-06-19 18:53:02 +02:00
86406c6cfe
Merge branch 'master' of git://anongit.kde.org/owncloud
2011-06-19 16:06:52 +02:00
Robin Appelman
Michael Gapczynski
Jakob Sack
Jan-Christoph Borchardt
Bartek Przybylski
Kunal Ghosh
Aamir Khan
Kamil Domanski
Dominik Schmidt