Michael Gapczynski
|
17058c9467
|
Merge branch 'master' into sharing
|
2011-07-31 12:53:34 -04:00 |
Robin Appelman
|
b93b066a42
|
fix search results having files from other users
|
2011-07-31 15:35:37 +02:00 |
Robin Appelman
|
5ef407d1c9
|
keyboard shortcuts for search results
|
2011-07-31 04:03:48 +02:00 |
Robin Appelman
|
2c8b4da840
|
make sure jquery and common javascript is loaded before the javascript of the apps
|
2011-07-31 02:24:46 +02:00 |
Robin Appelman
|
0bc16683e5
|
dont show music results twice
|
2011-07-31 02:20:34 +02:00 |
Michael Gapczynski
|
0d3ebbfefd
|
Merge branch 'master' into sharing
|
2011-07-30 19:57:57 -04:00 |
Michael Gapczynski
|
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 |
Robin Appelman
|
1564a40538
|
dont show the full path for the files in search results
|
2011-07-31 01:26:13 +02:00 |
Robin Appelman
|
0503c3499e
|
configure users/groups before loading apps
|
2011-07-31 00:23:06 +02:00 |
Jakob Sack
|
0dab7f2e53
|
laod apps ways earlier!
|
2011-07-31 00:06:17 +02:00 |
Robin Appelman
|
aafd36e2f3
|
provide json interface for search
|
2011-07-30 16:42:20 +02:00 |
Jakob Sack
|
bafd684eb6
|
Renaming classes :-)
|
2011-07-29 21:36:03 +02:00 |
Jakob Sack
|
2ff8d7a8bc
|
One class per file!
|
2011-07-29 21:03:53 +02:00 |
Jakob Sack
|
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 |
Michael Gapczynski
|
5fd77084c4
|
Merge branch 'master' into sharing
Conflicts:
core/templates/layout.user.php
|
2011-07-29 13:58:13 -04:00 |
Robin Appelman
|
d12d08e2f3
|
some more changes for navigation subentries
|
2011-07-29 19:43:06 +02:00 |
Robin Appelman
|
fe47d51598
|
some refactoring for subnavigation code
|
2011-07-29 19:12:55 +02:00 |
Michael Gapczynski
|
fcc9f50641
|
Merge branch 'master' into sharing
Conflicts:
files/templates/index.php
|
2011-07-29 10:23:15 -04:00 |
Robin Appelman
|
6d0c8ea7e4
|
use proper file icons for image and audio files
|
2011-07-29 01:37:08 +02:00 |
Jan-Christoph Borchardt
|
f1616b0e62
|
implemented relative file size and coloring
|
2011-07-29 00:46:20 +02:00 |
Robin Appelman
|
f1c2b5b304
|
set installed version in config file
|
2011-07-28 23:34:39 +02:00 |
Robin Appelman
|
20f5a9f085
|
bumb version number for upcomming beta
|
2011-07-28 23:34:39 +02:00 |
Robin Appelman
|
7d15a45e09
|
use oc_preferences to store ocs privatedata
|
2011-07-28 20:23:58 +02:00 |
Robin Appelman
|
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 |
Robin Appelman
|
7505720350
|
fix log when no tablename prefix is used
|
2011-07-27 22:44:51 +02:00 |
Jakob Sack
|
e69079f935
|
Further improvements
|
2011-07-27 20:04:42 +02:00 |
Jakob Sack
|
924100dd8c
|
One class per File
|
2011-07-27 19:52:24 +02:00 |
Jakob Sack
|
f5c0dbd947
|
Use autoload
|
2011-07-27 19:07:28 +02:00 |
Michael Gapczynski
|
ff3140052a
|
Merge branch 'master' into sharing
|
2011-07-26 21:29:44 -04:00 |
Robin Appelman
|
98cd83fabd
|
bumb jquery and jquery-ui versions
|
2011-07-25 23:16:05 +02:00 |
Robin Appelman
|
edec37b402
|
add OC_APP::getCurrentApp() to get the id of the active app
|
2011-07-25 20:25:53 +02:00 |
Robin Appelman
|
9a989a284a
|
fix sabredav for sqlite2
|
2011-07-25 03:14:22 +02:00 |
Michael Gapczynski
|
415ae8e40a
|
Merge branch 'master' into sharing
|
2011-07-24 16:08:39 -04:00 |
Jakob Sack
|
3097e4f48a
|
Merge branch 'sabredav'
|
2011-07-22 23:18:08 +02:00 |
Jakob Sack
|
ccc94819e2
|
Merge branch 'sabredav' of git://anongit.kde.org/owncloud into sabredav
|
2011-07-22 23:16:43 +02:00 |
Jakob Sack
|
5416c0e6f8
|
Remove HTTP_Webdav
|
2011-07-22 23:16:14 +02:00 |
Robin Appelman
|
18a36be28c
|
fix problem with removing locks
|
2011-07-22 23:06:53 +02:00 |
Jakob Sack
|
3b92ec12c2
|
Properties work fine now
|
2011-07-22 22:30:45 +02:00 |
Jakob Sack
|
5851da47f1
|
properties nearly work
|
2011-07-22 16:21:29 +02:00 |
Jakob Sack
|
7c9f356abe
|
Support for locks, minor changes
|
2011-07-22 14:38:42 +02:00 |
Michael Gapczynski
|
0387cc5f1f
|
Merge branch 'master' into sharing
|
2011-07-21 19:18:26 -04:00 |
Robin Appelman
|
f441059b01
|
add getLocalFile to local storage provider
|
2011-07-22 06:29:45 +02:00 |
Robin Appelman
|
8eefd42a7d
|
only remove old sqlite database if it exists
|
2011-07-21 00:52:48 +02:00 |
Michael Gapczynski
|
6af4c465b8
|
Change all occurences of ['user_id'] to OC_USER::getUser()
|
2011-07-20 16:52:01 -04:00 |
Michael Gapczynski
|
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 |
Michael Gapczynski
|
abf6ba621a
|
Merge branch 'master' into sharing
|
2011-07-20 14:30:19 -04:00 |
Jakob Sack
|
86cd8063b4
|
Use SabreDAV authentication Code!
|
2011-07-20 16:36:36 +02:00 |
Jakob Sack
|
bf1ca75710
|
Integration of SabreDAV
|
2011-07-20 15:53:34 +02:00 |
Bartek Przybylski
|
c5776fdae4
|
remember login added
|
2011-07-20 15:04:14 +02:00 |
Robin Appelman
|
6935f036a5
|
move list of mimetypes by extention to a seperate file.
|
2011-07-17 17:41:46 +02:00 |