Bart Visscher
|
077ea94f71
|
Merge commit 'refs/merge-requests/89' of git://gitorious.org/owncloud/owncloud
Conflicts:
apps/calendar/ajax/events.php
|
2012-05-03 23:18:43 +02:00 |
Robin Appelman
|
3d6909f372
|
add mount config to gitignore
|
2012-05-03 23:17:03 +02:00 |
|
Robin Appelman
|
a22a79cddd
|
fix filecache for postgresql
|
2012-05-03 23:17:03 +02:00 |
Arthur Schiwon
|
76a60a2fc3
|
ups, we don't have a CSS file therefore
|
2012-05-03 23:03:05 +02:00 |
|
Robin Appelman
|
9e03ea4a28
|
ensure the files app is always loaded
|
2012-05-03 20:47:18 +02:00 |
|
Bart Visscher
|
b62a8ba0f8
|
Better regex for old apps rewrite rule
|
2012-05-03 17:33:57 +02:00 |
|
Bart Visscher
|
b6ea57c8b6
|
Bookmarks: Move delete code to Bookmarks class, also change to use id
|
2012-05-03 17:33:57 +02:00 |
Thomas Tanghus
|
8076b1e12d
|
Contacts: Remove some logging.
|
2012-05-03 16:01:40 +02:00 |
|
Thomas Tanghus
|
a89231ac1d
|
Contacts: Clean up tipsies.
|
2012-05-03 16:01:40 +02:00 |
|
Thomas Tanghus
|
5be9084c73
|
Contacts: Fixed paths in import.
|
2012-05-03 16:01:40 +02:00 |
|
Thomas Tanghus
|
cbee0d3128
|
Contacts: Fix paths and improve markup and css in address book overview.
|
2012-05-03 16:01:40 +02:00 |
Frank Karlitschek
|
55194e0343
|
Merge branch 'master' of gitorious.org:owncloud/owncloud
|
2012-05-03 13:07:28 +02:00 |
|
Frank Karlitschek
|
97a8af7f25
|
ported oc_db
|
2012-05-03 13:06:08 +02:00 |
Bartek Przybylski
|
5611e6c9d3
|
fix incorrect dialog computing in ff
|
2012-05-03 12:32:37 +02:00 |
|
Frank Karlitschek
|
f85d076a4e
|
Merge branch 'master' of gitorious.org:owncloud/owncloud
|
2012-05-03 12:26:28 +02:00 |
|
Frank Karlitschek
|
43caa3b3b9
|
ported oc_json
|
2012-05-03 12:23:29 +02:00 |
|
Bartek Przybylski
|
8feb7dd9d9
|
fix filepicker in webkit
|
2012-05-03 12:09:59 +02:00 |
|
Thomas Tanghus
|
375ba98645
|
Contacts: Move gif used by jquery.Jcrop and make style sheet use %webroot% path.
|
2012-05-03 11:15:44 +02:00 |
|
Thomas Tanghus
|
15be032740
|
Contacts: Improve loading contact.
|
2012-05-03 11:15:44 +02:00 |
|
Thomas Tanghus
|
6cc9f600d2
|
Contacts: Don't resize profile picture if it's not too big.
|
2012-05-03 11:15:44 +02:00 |
|
Frank Karlitschek
|
351740601a
|
port oc_response
|
2012-05-03 10:46:27 +02:00 |
Michael Gapczynski
|
80dff77b65
|
Fix private links
|
2012-05-02 19:24:43 -04:00 |
|
Robin Appelman
|
e5ef3e1340
|
move archive library to core so we can properly depend on it
|
2012-05-02 23:48:23 +02:00 |
|
Robin Appelman
|
0b51c53443
|
run none of the extranal storage tests on default
|
2012-05-02 23:44:00 +02:00 |
|
Robin Appelman
|
4ba527625f
|
don't try to register file actions when we're not in the files app
|
2012-05-02 23:26:57 +02:00 |
|
Bart Visscher
|
47081a2471
|
Gallery: Update version for database update
|
2012-05-02 21:36:34 +02:00 |
|
Bart Visscher
|
f7e410147f
|
Contacts: check for malformed VCards in calendar hook
|
2012-05-02 21:36:33 +02:00 |
|
Bart Visscher
|
ec98ecff05
|
Catch old app paths, change them to new form
|
2012-05-02 21:36:33 +02:00 |
|
Michael Gapczynski
|
31d623f426
|
Fix log viewing bug
|
2012-05-02 15:26:42 -04:00 |
|
Michael Gapczynski
|
6d37b8567b
|
Refactoring and upload support for Google Drive backend
|
2012-05-02 14:41:57 -04:00 |
|
Frank Karlitschek
|
4fe90f62f4
|
port checkAppEnabled
|
2012-05-02 19:08:37 +02:00 |
|
Frank Karlitschek
|
eec7c3833c
|
fix install
|
2012-05-02 19:02:41 +02:00 |
|
Frank Karlitschek
|
10bbbc8cd2
|
new checkAppEnabled call
|
2012-05-02 18:54:31 +02:00 |
|
Bart Visscher
|
71f9b1968e
|
Tasks: Make it possible to close the details area
|
2012-05-02 17:28:19 +02:00 |
Georg Ehrke
|
33c343ed11
|
add require_once('../lib/base.php'); to webdav.php
|
2012-05-02 16:47:25 +02:00 |
|
Georg Ehrke
|
da03d05700
|
create folder 'remote' for the remote services like caldav, carddav and webdav
|
2012-05-02 16:41:23 +02:00 |
|
Georg Ehrke
|
c536e930f4
|
add appswebroot to the guest template
|
2012-05-02 16:41:23 +02:00 |
|
Frank Karlitschek
|
82a61e2e1a
|
port oc_preferences
|
2012-05-02 15:54:34 +02:00 |
|
Frank Karlitschek
|
ff66600bc0
|
port appconfig
|
2012-05-02 14:11:29 +02:00 |
|
Frank Karlitschek
|
8e99475886
|
first part of the config stuff
|
2012-05-02 13:28:56 +02:00 |
|
Frank Karlitschek
|
8c7f854671
|
move all the files stuff into a files class
|
2012-05-02 12:54:31 +02:00 |
|
Thomas Tanghus
|
f1830866a3
|
Contacts: Removed styling and (most) js from template. Started making app more keyboard/screenreader friendly. General cleanup in code and markup.
|
2012-05-02 12:10:44 +02:00 |
|
Thomas Tanghus
|
72256abf34
|
Contacts: Trying to improve PHOTO handling a bit.
|
2012-05-02 11:44:00 +02:00 |
|
Arthur Schiwon
|
6750998984
|
files is not internal any more, part II
|
2012-05-02 11:26:22 +02:00 |
|
Arthur Schiwon
|
d71600213a
|
files is not internal any more
|
2012-05-02 11:14:11 +02:00 |
|
Arthur Schiwon
|
c9eaffd336
|
send downloadfile piece by piece. saves RAM and is better suited for large files.
|
2012-05-02 11:02:13 +02:00 |
Thomas Müller
|
8ed8d9cd91
|
fixing namespace
|
2012-05-02 00:55:26 +02:00 |
|
Frank Karlitschek
|
2fe646dcec
|
ported the oc_app calls
|
2012-05-02 00:50:26 +02:00 |
|
Frank Karlitschek
|
c94f39b488
|
Merge branch 'master' of gitorious.org:owncloud/owncloud
|
2012-05-02 00:24:24 +02:00 |
|
Frank Karlitschek
|
93b63cf375
|
ported the rest of the OC_Helper calls
|
2012-05-02 00:20:45 +02:00 |