Frank Karlitschek
e2fb094693
some more porting
2012-05-01 21:07:08 +02:00
Frank Karlitschek
ab58471904
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-05-01 20:07:36 +02:00
Frank Karlitschek
1a2bbd2ee4
ported addSyript and other small stuff
2012-05-01 20:03:41 +02:00
Michael Gapczynski
20f3875f1b
Change default from address to sharing-noreply@server for emailing private links
2012-05-01 13:06:17 -04:00
Frank Karlitschek
254b8b9506
porting of OC_User to public API complete.
...
What better thing to do during a long train ride than refactoring ;-)
2012-05-01 19:04:20 +02:00
Frank Karlitschek
70cea18cce
ported getUser
2012-05-01 18:50:31 +02:00
Frank Karlitschek
5bf69237b2
ported isLoggedIn
2012-05-01 18:46:15 +02:00
Frank Karlitschek
d0554bef06
finish porting of the LOG calls or the apps to the public api
2012-05-01 17:38:27 +02:00
Frank Karlitschek
3f9ac6405a
port some of the log call to the new public api
...
more to come
2012-05-01 14:29:34 +02:00
Arthur Schiwon
51b6aab436
LDAP: remove Notices on settings
2012-05-01 12:25:17 +02:00
Arthur Schiwon
54854b2e3d
LDAP: decent behaviour and log message when there is no connection to the LDAP server
2012-05-01 12:17:33 +02:00
Bartek Przybylski
11314c81d9
add/remove handlers
2012-05-01 10:07:48 +02:00
Frank Karlitschek
e8ec999090
port to use the new public api
2012-05-01 09:49:22 +02:00
Frank Karlitschek
e409e7cd4c
forgot a file
2012-05-01 09:38:10 +02:00
Thomas Müller
5193ddd7d7
fixing syntax error
2012-04-30 21:55:25 +02:00
Georg Ehrke
8a3d41c043
fix a PHP Notice
2012-04-30 21:46:33 +02:00
Georg Ehrke
6c908a4cd0
fix path in calendars geo.js
2012-04-30 21:18:54 +02:00
Frank Karlitschek
f425b80deb
one todo less
2012-04-30 19:21:29 +02:00
Frank Karlitschek
b20b30b6fe
Implement a basic versioning configuration. Only a on/off switch for now.
...
I changed my mind about the more complex configuration options. We go with good default for now and don´t expose all the technical options to the users.
They can still override in the config file if it´s really really needed and they know what they are doing
2012-04-30 19:18:00 +02:00
Thomas Mueller
07f2e316e4
removing executable bit from various files
2012-04-30 12:05:57 +02:00
Thomas Tanghus
9c520c70a8
Various file path fixes.
2012-04-30 01:48:01 +02:00
Thomas Tanghus
a8b6fdd396
Contacts: Small css tweaks.
2012-04-30 01:01:24 +02:00
Thomas Tanghus
0bccd9c18c
Contacts: Forgot to add the import template.
2012-04-29 23:26:14 +02:00
Thomas Tanghus
f6fefe9a36
Contacts: Ensure TYPE parameters on email aren't deleted on edit. They are still not shown in the UI.
...
Remove an obsolute file and did some cleanup.
2012-04-29 22:12:27 +02:00
Thomas Tanghus
023479b1e2
Contacts: removed unused method and ajax file.
2012-04-29 22:12:27 +02:00
Thomas Tanghus
163344243b
jquery.combobox: Added 'showButton' option
2012-04-29 22:12:27 +02:00
Frank Karlitschek
b862c49ae6
enable by default. at least during oC4 testing
2012-04-29 21:18:28 +02:00
Frank Karlitschek
0d0129221b
add a info.xml to files
2012-04-29 21:17:22 +02:00
Robin Appelman
84bd83b1dc
fix file deletion
2012-04-29 16:09:41 +02:00
NIEK Antoine
c6f034a5d2
Support "songs" ampache API action for proper rhythmbox support
2012-04-29 00:47:57 +02:00
Jan-Christoph Borchardt
afeb9d9cbf
moving the file actions properly
2012-04-28 23:11:48 +02:00
Georg Ehrke
bef701c448
add version file to files app
2012-04-28 13:35:05 +02:00
Georg Ehrke
7eb7492360
some fixes for sharing
2012-04-27 23:14:53 +02:00
Bartek Przybylski
72c0d6968e
fix duplicated entries on upload
2012-04-27 22:48:27 +02:00
Bart Visscher
6e7f5ec4ce
Tasks: Add input to edit the task location
2012-04-27 20:26:12 +02:00
Bart Visscher
c627657fc6
Tasks: Fix the display of the list of tasks
2012-04-27 17:48:08 +02:00
Sam Tuke
a1b309a42a
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-04-27 13:23:58 +01:00
Georg Ehrke
0aaf6d16a5
Merge branch 'master' into movable_apps_2
2012-04-27 14:22:12 +02:00
Sam Tuke
80c850d018
added revert attempt outcome messages, removed contextual ajax revert button for now as it's not functional, improved readaibility of scripts
2012-04-27 13:19:16 +01:00
Thomas Tanghus
768041b6cb
Contacts: Added convinience method for notifications.
2012-04-27 10:35:31 +02:00
Thomas Tanghus
18c11ec81b
jquery.combobox: Added 'editable' option and cleaned up a bit.
2012-04-27 10:35:31 +02:00
Thomas Tanghus
1384fdfe01
Contacts: Updated first run page.
2012-04-27 10:35:31 +02:00
Georg Ehrke
f7fb4a54c9
ampache should work now
2012-04-26 22:00:37 +02:00
Georg Ehrke
5fda0e4b3b
make *DAV work with movable apps
2012-04-26 21:56:29 +02:00
Georg Ehrke
6930af4c0f
Merge branch 'master' into movable_apps_2
2012-04-26 21:27:22 +02:00
Georg Ehrke
78b2da583d
move files to the correct place
2012-04-26 21:24:41 +02:00
Sam Tuke
d96e962fc1
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-04-26 18:45:59 +01:00
Sam Tuke
18a024e251
started implementing ajax file rollback
2012-04-26 18:45:17 +01:00
Georg Ehrke
2b10371bde
fix merge conflicts
2012-04-26 18:08:49 +02:00
Georg Ehrke
40f95ffdf3
fix security check for the path of the requested file
2012-04-26 17:55:00 +02:00
Sam Tuke
c693ee2adb
added available version names to files dropdown menu via new ajax script
2012-04-26 16:48:43 +01:00
Georg Ehrke
0249a72cab
fix downloading of files in files app
2012-04-26 17:35:12 +02:00
Michael Gapczynski
754844f5c9
Add ability to send private links from sharing via email
2012-04-26 10:33:24 -04:00
Sam Tuke
6312067ab5
improved styling, called css file in history.php
2012-04-26 14:32:29 +01:00
Georg Ehrke
ebd82ee772
fixes for media app
2012-04-26 15:23:17 +02:00
Georg Ehrke
2c92a79b5d
fixes for contacts app
2012-04-26 15:20:01 +02:00
Sam Tuke
b19fae392b
linked more button to history page
2012-04-26 13:54:38 +01:00
Georg Ehrke
3f64eb25ab
some fixes fore movable apps
2012-04-26 14:52:55 +02:00
Sam Tuke
02c1127de3
changed function name to avoid clash with sharing dropdown
2012-04-26 13:41:22 +01:00
Thomas Tanghus
4bb1a2c2d6
Contacts: Some js cleanup.
2012-04-26 10:38:39 +02:00
Thomas Tanghus
5dbf362623
Contacts: Added import with with file picker.
2012-04-26 03:21:52 +02:00
Michael Gapczynski
c20abfef38
Fix a counting mistake
2012-04-25 19:30:58 -04:00
Michael Gapczynski
32de47d1d9
Update sharing when users are removed, added to groups, and removed from groups
2012-04-25 18:18:58 -04:00
Georg Ehrke
b75f680b8e
gallery app seems to work now :)
2012-04-25 21:20:30 +02:00
Georg Ehrke
1a913ac282
bookmarks app seems to work now :)
2012-04-25 21:20:06 +02:00
Michael Gapczynski
6895c54a3f
Fix javascript checkbox toggle for resharing
2012-04-25 14:37:14 -04:00
Arthur Schiwon
cbba469990
LDAP rewrite, use unique LDAP user and group identifiers on LDAP side as well as fancy (unqiue as far as users a know from LDAP) names on the ownCloud side. It's done via mapping of owncloud names and LDAP identifiers.
...
some performance enhancements: faster searching for users and groups in their specific subtrees. Reading instead of searching were possible.
thanks for the feedback of Kevin van Kuik
2012-04-25 20:35:30 +02:00
Arthur Schiwon
0933b5e7ab
use uniquemember instead of deprecated memberuid to identify LDAP group members. Attention: not every method is adjusted yet, so it breaks some things.
2012-04-25 20:35:30 +02:00
Arthur Schiwon
a82d709f87
don't forget new JS file
2012-04-25 20:35:30 +02:00
Arthur Schiwon
e1cd690a7c
LDPA: group settings into basic and advanced to look less crowded. Still needs some love. Looks different to the other admin settings, though.
2012-04-25 20:35:29 +02:00
Sam Tuke
c00762b49b
added dropdown js menu for file versions, improved readability of history.php
2012-04-25 17:37:45 +01:00
Michael Gapczynski
7d9587bab3
Forgot to remove error log messages...
2012-04-25 11:54:16 -04:00
Michael Gapczynski
b369adbd94
Allow admin to disable resharing of files
2012-04-25 11:51:30 -04:00
Sam Tuke
a3dff248a1
fixed path to history script
2012-04-25 14:27:55 +01:00
Sam Tuke
8ae1430090
added script and loaded it for adding history button
2012-04-25 13:56:43 +01:00
Sam Tuke
81f549baee
made code a little more readable
2012-04-25 13:51:08 +01:00
Thomas Tanghus
4795295fb1
Contacts: Fixed some file paths.
2012-04-25 10:44:27 +02:00
Georg Ehrke
d76552a009
Merge branch 'sabredav_1.6'
2012-04-25 10:39:31 +02:00
Thomas Tanghus
20f1c1e6ca
Forgot to fix one file...
2012-05-06 00:39:01 +02:00
Bart Visscher
6c554d0ffa
Calendar: Fix calendar export link
2012-05-06 00:35:49 +02:00
Thomas Tanghus
93ae945414
Contacts: Fix for leftcontent positioning in Android browser.
2012-05-06 00:34:08 +02:00
Thomas Tanghus
2953f4d11a
Contacts: Removed redundant styles.
2012-05-06 00:34:07 +02:00
Frank Karlitschek
b462795be2
added a nice API to get the installes Apps with names, urls and icon from the outside.
...
This is useful for some nice upcoming desktop and mobile integration
2012-05-05 23:42:38 +02:00
Michael Gapczynski
565e02d061
Add back removed groups to the select form correctly
2012-05-05 17:10:07 -04:00
Bart Visscher
d854e4a144
Calendar: fix return of insert id
2012-05-05 22:32:55 +02:00
Bart Visscher
f991948a71
Fix loading by apptype in webdav
2012-05-05 21:58:10 +02:00
Michael Gapczynski
ef9511c713
Refactor sharing UI; bug fixes, code clean-up, and more efficient with less ajax calls
2012-05-05 15:18:14 -04:00
Michael Gapczynski
d764585d8b
Remove blind effect for email private link in drop down
2012-05-05 14:57:25 -04:00
Georg Ehrke
03f81fdd88
fix js fail in media player
2012-04-25 10:27:17 +02:00
Georg Ehrke
323b19a4a0
some fixes in contacts javascript files
2012-04-25 10:17:54 +02:00
Georg Ehrke
60c0827ba3
Merge branch 'master' into movable_apps
2012-04-25 09:23:01 +02:00
Georg Ehrke
9ee2bb9719
fix js fail in media player
2012-04-25 09:22:19 +02:00
Robin Appelman
5b70e2fb25
some performance improvements to the openstack swift backend
2012-04-25 00:12:12 +02:00
Robin Appelman
5c3ea14819
fix mimetypes of encrypted files
2012-04-25 00:12:12 +02:00
Georg Ehrke
f17eea506a
fix merge conflicts
2012-04-24 21:59:56 +02:00
Georg Ehrke
684007bbae
fix pathes in contacts
2012-04-24 21:33:34 +02:00
Frank Karlitschek
a3d0a74d03
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-04-24 15:38:36 +02:00
Frank Karlitschek
69a2173fdb
non working app. moved to the apps-playground repository
2012-04-24 14:00:44 +02:00
Thomas Tanghus
b824425186
Added loading indicator.
2012-04-24 11:38:11 +02:00
Thomas Tanghus
988f98fc6f
Contacts: Check that UIDs really are unique on import. Better solution would be to suggest to merge contacts, but that will have to wait to OC5 ;-)
2012-04-24 11:35:56 +02:00
Thomas Tanghus
22f4acadc0
Contacts: In app import (for Chrome and Firefox only)
2012-04-24 01:44:07 +02:00
Thomas Tanghus
b8da5c5262
Contacts: Tried to format NOTE field a bit. Needs to be improved more though.
2012-04-24 01:44:07 +02:00
Thomas Tanghus
dfc94cbe84
Contacts: In app import. Cleanup still needed.
2012-04-24 01:44:07 +02:00
Thomas Tanghus
0cd9570277
Applied patches by Nicolas progweb at free.fr - https://mail.kde.org/pipermail/owncloud/2012-April/002900.html
2012-04-24 01:44:07 +02:00
Frank Karlitschek
4ea927a798
wrote a new versioning app over the weekend. Basic functionality to far but it works (TM) and has all the needed features (TM) for ownCloud 4. Userinterface integration and small improvements still missing.
2012-04-23 23:54:49 +02:00
Bart Visscher
b704ff1bc7
Tasks: Simple add task action
2012-04-23 22:13:35 +02:00
Georg Ehrke
fd47fbe176
fix contacts app a bit
2012-04-23 20:42:52 +02:00
Georg Ehrke
9092692b8e
make calendar work with movable apps
2012-04-23 20:32:55 +02:00
Georg Ehrke
10eea3f464
fix pathes of shared calendars
2012-04-23 20:13:55 +02:00
Georg Ehrke
d1110c62ef
fix file path in apps/media/ajax/api.php
2012-04-23 20:01:48 +02:00
Georg Ehrke
42a570788b
Merge branch 'master' into movable_apps
2012-04-23 19:56:07 +02:00
Bart Visscher
728e6a6bf9
Tasks: Simple categories input
2012-04-23 18:28:44 +02:00
Georg Ehrke
3b9d283245
fix path in apps/files/templats/index.php
2012-04-23 16:25:07 +02:00
Georg Ehrke
c0df15367f
fix style.css of the files app
2012-04-23 16:18:15 +02:00
Georg Ehrke
08fe6bdb27
fix path in /apps/files/js/timezone.php
2012-04-23 16:17:35 +02:00
Jan-Christoph Borchardt
3ba9a9e6a8
adding proper copyright and license notice to the style files
2012-04-23 14:19:03 +02:00
Arthur Schiwon
912c87eeda
LDAP: optimize LDAP requests for users and groups. Settings are still to do, though.
2012-04-23 13:04:58 +02:00
Georg Ehrke
1b084cc120
Merge branch 'master' into movable_apps
2012-04-23 13:03:50 +02:00
Arthur Schiwon
6ee7dc5f59
only retrieve requested attributes
2012-04-23 12:32:17 +02:00
Arthur Schiwon
fffbf26159
don't forget to declare class properties
2012-04-23 11:22:11 +02:00
Thomas Tanghus
82ba2151d1
Wrong app check.
2012-04-23 10:52:13 +02:00
Thomas Tanghus
8f2e9caf96
Contacts: Tipsyfied photo toolbar.
2012-04-23 10:52:13 +02:00
Robin Appelman
d17eba19c1
fix image viewer
2012-04-22 21:27:20 +02:00
Robin Appelman
c5b31b001a
add the option to disable file encryption while still being able to decrypt existing files
2012-04-22 21:27:20 +02:00
Thomas Tanghus
e8f062dc93
Contacts:
...
- Added overlay toolbar to contact photo with 'Delete current', 'Edit current', 'Load from OC_Filesystem' and 'Upload' options.
- Made action icons translucent instead of hiding them.
2012-04-22 20:47:24 +02:00
Thomas Tanghus
8a6cb23170
Contacts: Clear cache for contact photo and thumbnail when it has been changed.
2012-04-22 20:47:24 +02:00
Georg Ehrke
e888f4d9bc
Merge branch 'master' into sabredav_1.6
2012-04-22 13:20:50 +02:00
Georg Ehrke
4c2cf35050
fix merge conflicts
2012-04-22 13:19:12 +02:00
Georg Ehrke
1bba445642
hide alarm and attendees tab
2012-04-22 13:15:24 +02:00
Thomas Tanghus
f08cfcecec
Personal settings: Emphasized labels etc, mono-spaced generated paths and moved text formatting to style sheet.
2012-04-22 03:59:28 +02:00
Thomas Tanghus
24aff287cf
Link to icon was absolute.
2012-04-22 03:39:59 +02:00
Thomas Tanghus
f85aaf1f58
Contacts: Added bg color and shadow to controls. I suck at CSS...
2012-04-22 02:32:51 +02:00
Thomas Tanghus
80ddf37bb7
Missing double quote.
2012-04-22 02:09:13 +02:00
Thomas Tanghus
651de1e588
Contacts: Fix error on photo crop.
2012-04-22 01:50:46 +02:00
Thomas Tanghus
9e3242d05e
Contacts: Changed layout as discussed with JanC. Still WiP.
2012-04-22 00:44:53 +02:00
Thomas Tanghus
56e064bd09
Don't trigger unnecessary change events.
2012-04-22 00:44:53 +02:00
Thomas Tanghus
16fc4dfd1a
Contacts: Fixed contact photo drag'n'drop upload - again...
2012-04-22 00:44:53 +02:00
Thomas Tanghus
a34631f84e
Contacts: Add check for empty FN field.
2012-04-22 00:44:53 +02:00
Frank Karlitschek
69f3b5e2d2
make the button a bit more consistent to the other ownCloud interface
2012-04-21 23:34:24 +02:00
Frank Karlitschek
260c48c29a
cleanup the admin page layout mess a bit. Still a lot to improve in the future :-)
2012-04-21 23:23:02 +02:00
Georg Ehrke
0918fc7d91
fix merge conflicts
2012-04-21 23:21:50 +02:00
Frank Karlitschek
80950f2e1c
make field completely visible
2012-04-21 23:10:35 +02:00
Frank Karlitschek
ff3b199cc8
use less space
2012-04-21 23:08:52 +02:00
Frank Karlitschek
1a49497899
structure the information a bit more so that is easier readable
2012-04-21 22:55:18 +02:00
Georg Ehrke
74e5402711
fix a php notice
2012-04-21 22:27:19 +02:00
Georg Ehrke
e29ae46609
fix merge conflicts
2012-04-21 22:12:31 +02:00
Bart Visscher
acea156a3d
Tasks: Save description field
2012-04-20 23:37:42 +02:00
Bart Visscher
3d68732657
Tasks: Due date without time support added
2012-04-20 22:56:59 +02:00
Georg Ehrke
711aa229b8
Merge branch 'master' into movable_apps
2012-04-20 22:41:39 +02:00
Georg Ehrke
c3d78cf77a
remove require once lib base in files scan.php
2012-04-20 22:34:13 +02:00
Bart Visscher
1384be4bff
Tasks: Task summary is always text, at it as suchs
2012-04-20 18:19:10 +02:00
Bart Visscher
70ba428222
Tasks: Make gettasks more robust against malformed VTODO data
2012-04-20 18:18:07 +02:00
Bart Visscher
c75bbb59a9
Tasks: Add due property handling
2012-04-20 18:16:39 +02:00
Georg Ehrke
3aeea0c196
Merge branch 'merge-requests/105'
2012-04-19 20:31:24 +02:00
Georg Ehrke
3706bbec1b
Merge commit 'refs/merge-requests/105' of git://gitorious.org/owncloud/owncloud into merge-requests/105
2012-04-19 20:30:58 +02:00
Robin Appelman
5cefd34660
emulate touch with custom mtime for swift backend
2012-04-19 00:25:47 +02:00
Robin Appelman
9a707e10bf
add SWIFT (openstack object storage) storage backend
2012-04-18 20:54:28 +02:00
Robin Appelman
d1ad4dc8d6
add test cases for cryptstream
2012-04-18 20:54:28 +02:00
Robin Appelman
b39c3d4c4e
make use of the fact that stream_read will always read 8192 bytes for encryption stream
...
https://bugs.php.net/bug.php?id=21641
2012-04-18 20:54:28 +02:00
Robin Appelman
26e9a0dd13
bugfixes for encryption library and test cases
2012-04-18 20:54:28 +02:00
Georg Ehrke
b44bc9f4b2
remove require once lib base in some more files
2012-04-18 17:42:11 +02:00
Bart Visscher
921fc59d8f
Tasks: Add "more" block containing description
2012-04-18 17:28:16 +02:00
Georg Ehrke
45de7ad221
move files to app folder
2012-04-18 17:27:34 +02:00
Georg Ehrke
eb29c577c2
Merge branch 'master' into movable_apps
2012-04-18 12:20:09 +02:00
Georg Ehrke
cf492a9649
Merge branch 'master' into calendar_sharing
2012-04-18 11:51:59 +02:00
Georg Ehrke
de71842888
implement shared calendar activation on server side
2012-04-18 11:50:12 +02:00
Georg Ehrke
8959e0af3d
implement shared calendar activation on js-side
2012-04-18 11:39:00 +02:00
Georg Ehrke
7402543d3e
resotre old templates/part.choosecalendar.rowfields.php - i hate merge conflicts
2012-04-18 09:53:54 +02:00
Georg Ehrke
69ee0efc0b
remove the require_once lib base from all (or nearly all) files
2012-04-17 19:31:29 +02:00
Robin Appelman
4dabd0fb9c
test data for archives
2012-04-17 18:04:06 +02:00
Bart Visscher
6ba30cb713
Tasks: Clicking task summary opens input for edit
2012-04-17 17:32:21 +02:00
Arthur Schiwon
66018b89b2
LDAP: don't forget to unbind
2012-04-16 18:03:02 +02:00
Arthur Schiwon
86192c2f8d
checked, works for me
2012-04-16 17:31:39 +02:00
Arthur Schiwon
9cd5221d47
group ldap: check configuration
2012-04-16 17:28:58 +02:00
Arthur Schiwon
ed54de1bbf
group LDAP: implement groupExists function, needed for Sharing
2012-04-16 16:23:00 +02:00
Bart Visscher
8afeb0fedb
Tasks: Implement task lists overview
2012-04-16 15:34:14 +02:00
Arthur Schiwon
320fde9eec
OC_Group does expect object, not string
2012-04-16 15:09:38 +02:00
Arthur Schiwon
899c7631d5
minor code beautification
2012-04-16 15:09:38 +02:00
Arthur Schiwon
e1948c651b
use the right attribute for member retrieval
2012-04-16 15:09:38 +02:00
Arthur Schiwon
02f4e78f3e
a string be a string
2012-04-16 15:09:38 +02:00
Jan-Christoph Borchardt
70d0103a67
updated logos and icons
2012-04-16 11:34:16 +02:00
Georg Ehrke
77cefdedb8
Merge branch 'master' into sabredav_1.6
2012-04-15 22:28:11 +02:00
Georg Ehrke
dc18e65b46
fix merge conflicts
2012-04-15 22:26:55 +02:00
Tom Needham
b0e68d039c
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-04-15 15:09:54 +00:00
Tom Needham
712e25bb02
Update ace
2012-04-15 15:09:37 +00:00
Jakob Sack
0b426b5e64
Display correct URL in caldav and carddav paths
2012-04-15 16:50:45 +02:00
Jakob Sack
9b1d6246a9
Remove useless, unmaintained dav.php
2012-04-15 16:50:44 +02:00
Robin Appelman
9ac65c51f5
dont try to view psd files
2012-04-15 16:26:08 +02:00
Tom Needham
fef3434bdf
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-04-15 14:02:13 +00:00
Tom Needham
738601f4fe
Remove google web font
2012-04-15 14:01:59 +00:00
Thomas Müller
679ddc0e32
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-04-15 16:01:06 +02:00
Thomas Müller
f36d31f74d
pdfjs updated from github
2012-04-15 15:59:31 +02:00
Arthur Schiwon
80f4c4f923
Bookmarks: handle input with & and ?, fixes oc-201
2012-04-15 15:53:40 +02:00
Tom Needham
9ee3eb1412
remove unused css
2012-04-15 13:44:43 +00:00
Bart Visscher
947d2e5705
Tasks: Mark task as complete when checking the checkbox
2012-04-15 15:39:49 +02:00
Bart Visscher
19d81068f6
Tasks: Code cleanup
2012-04-15 15:38:44 +02:00
Robin Appelman
b3ae2208b1
clean the collection view after rescanning
2012-04-15 15:19:30 +02:00
Robin Appelman
cf3bb08dfb
enable archive support on default
2012-04-15 15:19:30 +02:00
Robin Appelman
9ee931e790
only run archive tests if the test data is available
2012-04-15 15:19:30 +02:00
Arthur Schiwon
819af69972
group LDAP: simple basic tests
2012-04-15 14:50:03 +02:00
Arthur Schiwon
0a46c7a393
group LDAP: usersInGroup not getUsersInGroup
...
offer static readonly properties
2012-04-15 14:50:03 +02:00
Arthur Schiwon
2a03db6065
don't forget changes in lib_ldap for last commit
2012-04-15 14:50:03 +02:00
Arthur Schiwon
8a6fa65ed6
group LDAP: implemented getUsersInGroup()
2012-04-15 14:50:03 +02:00
Arthur Schiwon
b480071946
group LDAP: implemented getUserGroups()
2012-04-15 14:50:03 +02:00
Arthur Schiwon
0912f40ebe
typo
2012-04-15 14:50:03 +02:00
Arthur Schiwon
54a9fd2e6a
group LDAP: implemented inGroup()
2012-04-15 14:50:03 +02:00
Georg Ehrke
8ddea7e95c
Merge branch 'master' into calendar_sharing
2012-04-15 14:28:31 +02:00
Jan-Christoph Borchardt
7ddd043427
renamed extention to extension, also now only showing lowercase
2012-04-15 13:34:30 +02:00
Georg Ehrke
e292b1fcdb
fix merge conflicts
2012-04-15 12:43:07 +02:00
Bart Visscher
3b71e46cf7
Contact: Don't use non core class in appinfo/app.php
2012-04-14 18:34:59 +02:00
Arthur Schiwon
29bb5d27e4
few pieces of documentation
2012-04-14 18:26:51 +02:00
Arthur Schiwon
19243b3e91
give back expected result types as long as logic is not there yet
2012-04-14 18:08:40 +02:00
Arthur Schiwon
e160acefe3
test for ldap group backend
2012-04-14 18:08:40 +02:00
Arthur Schiwon
61a43419a5
starting to create the ldap group backend (with some inspiration from Yoann Gini) and preparing an general LDAP class
2012-04-14 18:08:40 +02:00
Robin Appelman
b1bcc60d83
reuse OC_L10N objects
2012-04-14 16:44:15 +02:00
Robin Appelman
926b2b78fe
keep version numbers in their own files for faster reading
2012-04-14 16:29:11 +02:00
Bart Visscher
029e1aced7
Tasks: Update to use new categories interface
2012-04-14 14:55:37 +02:00
Tom Needham
44c34115a4
Remove go to line
2012-04-14 12:49:31 +00:00
Bart Visscher
7d1880078c
Merge branch 'master' into tasks
2012-04-14 13:47:56 +02:00
Tom Needham
9b1c881ca8
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-04-14 11:18:25 +00:00
Bart Visscher
5c55b9c5ac
Sharing: Add a filename after public share link
...
We don't do anythink with the name, but it is nice to know the file the
link point to.
2012-04-14 12:45:32 +02:00
Bart Visscher
524bd2e75f
Sharing: Don't get share icon for undefined filename
2012-04-14 12:45:32 +02:00
Bart Visscher
7504ceb6f2
Sharing: Define missing template vars
2012-04-14 12:45:32 +02:00
Robin Appelman
3babb8c22c
improve flexibility of search providers a bit
2012-04-14 11:29:54 +02:00
Arthur Schiwon
8ed4606685
LDAP: don't keep possibly outdated passwords
2012-04-14 11:08:50 +02:00
Georg Ehrke
e256ac8791
fix unsharing of events
2012-04-13 21:49:24 -04:00
Georg Ehrke
c65adc12d5
add chosen script to calendar
2012-04-13 21:29:51 -04:00
Georg Ehrke
5d4c546693
fix public sharing of calendars
2012-04-13 17:36:47 -04:00
Georg Ehrke
ea3499a712
fix class name
2012-04-13 17:26:34 -04:00
Georg Ehrke
1e0364baa8
check permission check in share function
2012-04-13 17:16:28 -04:00
Georg Ehrke
77a9e343aa
Merge branch 'master' into sabredav_1.6
2012-04-13 16:42:10 -04:00
Georg Ehrke
afcb0aee40
fix merge conflicts
2012-04-13 16:40:10 -04:00
Georg Ehrke
02dc343209
fix address of public shared calendars
2012-04-13 16:26:06 -04:00
Georg Ehrke
854eaff34f
hide share tab in shared events
2012-04-13 16:20:19 -04:00
Tom Needham
0aaaefbb4b
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-04-13 20:10:35 +00:00
Tom Needham
1165b358b4
Update language string
2012-04-13 20:09:04 +00:00
Bart Visscher
b9f9228a22
Contacts: Save the category list update when updating/adding contact
2012-04-13 21:13:58 +02:00
Bart Visscher
4c52007996
Calendar: Update category list when updating/adding event
2012-04-13 21:13:58 +02:00
Bart Visscher
471e735b0c
Calendar: Document active parameter in allCalendars
2012-04-13 21:13:58 +02:00
Bart Visscher
7cf7d5c3dd
Calendar: Also set repeat options when editing a non repeating event
2012-04-13 21:13:58 +02:00
Bart Visscher
28e0d64ede
Calendar: Fix saving of Categories in an event
2012-04-13 21:13:58 +02:00
Bart Visscher
f9b7ed3a1f
Calendar: Implement rescan of Categories
2012-04-13 21:13:58 +02:00
Thomas Tanghus
6aee6dae6b
VCategories css is now in styles.css
2012-04-13 18:50:40 +02:00
Thomas Tanghus
b654121b50
Contacts: Better error reporting.
2012-04-13 18:50:40 +02:00
Robin Appelman
6066ea3170
only run tests for files_external when asked for explicitly
2012-04-13 18:49:50 +02:00
Robin Appelman
8686667b10
some idexes for the media player tables
2012-04-13 18:49:50 +02:00
Georg Ehrke
df2e788a1c
fix calendarid in eventform and validation of calendarid
2012-04-12 23:15:19 -04:00
Georg Ehrke
a7908ba76b
fix bugs in share class
2012-04-12 22:11:48 -04:00
Bart Visscher
e9c1f8b4e6
Contacts: No need to sort the categories anymore
2012-04-12 23:10:49 +02:00
Bart Visscher
43ba23430d
Contacts: Change "category" to "group" in UI
2012-04-12 23:10:49 +02:00
Bart Visscher
78189e2247
Contacts: update category list when the categories change
2012-04-12 23:10:49 +02:00
Bart Visscher
9165b5c28e
Use the same category input and management as the contacts app
2012-04-12 23:10:49 +02:00
Bart Visscher
b2011bd0a0
Remove unused function getCategoryOptions from OC_Calendar_Object
2012-04-12 23:10:49 +02:00
Bart Visscher
5fa90cd214
Contacts: Also initialize org var in updateValuesFromAdd
2012-04-12 23:10:49 +02:00
Bart Visscher
86edc0da31
Contacts: add space before parameter
2012-04-12 23:10:49 +02:00
Bart Visscher
fa853102e4
Contacts: Move use of OC_Contacts_App::$categories to inside of OC_Contacts_App
...
This is in preparation of making $categories protected and initialized
with default categories.
2012-04-12 23:10:49 +02:00
Frank Karlitschek
48f99fe661
off by default. great tool for developers but confusing for users.
2012-04-12 20:23:45 +02:00
Deepak Mittal
bd262eaac0
Fixed OC-261 by modifying js files in apps/media/
2012-04-12 17:56:53 +02:00
Daniele E. Domenichelli
d9aa31fd92
Use OC_Helper::serverHost() in openid settings
2012-04-12 17:51:17 +02:00
Robin Appelman
8cea656ad7
upgrade getid3
2012-04-12 15:54:08 +02:00
Georg Ehrke
0f16935763
fix bugs and optimize OC_Calendar_Object Class
2012-04-11 10:21:45 -04:00
Georg Ehrke
613e15035e
Merge branch 'master' into sabredav_1.6
2012-04-10 22:44:13 -04:00
Georg Ehrke
ac2d14101c
Merge branch 'master' into calendar_sharing
2012-04-10 20:10:07 -04:00
Georg Ehrke
64d3301523
make shared events editable and add (empty) classes for alarm and attendees
2012-04-10 16:03:38 -04:00
Bart Visscher
2dfa02a346
Contacts: fix function names to coding standard
2012-04-10 21:53:36 +02:00
Bart Visscher
3f6e971571
Contacts: Don't lowercase categories value when saving
2012-04-10 21:19:39 +02:00
Bart Visscher
fd72556fd1
Contacts: Make part.no_contacts.php translatable
2012-04-10 21:15:38 +02:00
Georg Ehrke
eaa649cfb2
fix bug in share lib of calendar
2012-04-10 11:18:02 -04:00
Frank Karlitschek
47f94548ce
don´t enable by default. still broken
2012-04-10 15:05:33 +02:00
Frank Karlitschek
6cf3f10d35
fix includes
2012-04-09 22:51:53 +02:00
Frank Karlitschek
b0894b3148
Add Craigs granite library to 3rdparty and files_versioning. Still not working and lots ot stuff to do.
2012-04-09 22:10:29 +02:00
Thomas Tanghus
4fda6af725
Contacts: Fix for not being able to add contact to empty/non-existant address book.
2012-04-09 16:30:58 +02:00
Thomas Tanghus
9c247ce874
Removed padding.
2012-04-09 16:30:58 +02:00
Thomas Tanghus
53091551d8
Re-added file I had accidentally removed earlier :-P
2012-04-09 16:30:58 +02:00
Tom Needham
ecc596534a
Decode json response for admin exports
2012-04-08 19:08:17 +00:00
Georg Ehrke
9294a95438
fix view of single shared events
2012-04-07 22:54:38 -04:00
Georg Ehrke
960553f9c4
fix path and class name
2012-04-07 22:45:44 -04:00
Georg Ehrke
5a4237a31d
make dropdown menu work with single event sharing
2012-04-07 22:41:24 -04:00
Georg Ehrke
97d216c94d
add dropdown to eventform
2012-04-07 22:40:20 -04:00
Georg Ehrke
4d884c3849
clean up events.php of calendar
2012-04-07 22:39:37 -04:00
Georg Ehrke
e940152bce
fix bugs in share lib of calendar
2012-04-07 22:39:02 -04:00
Georg Ehrke
eef9a1e7ed
add access check to ajax files
2012-04-07 22:37:26 -04:00
Georg Ehrke
e18c0d54f6
add output functions and access function to app.php of calendar
2012-04-07 22:35:29 -04:00
Tom Needham
c0869887cf
Return JSON for import and export methods of OC_Migrate
2012-04-07 21:55:16 +00:00
Tom Needham
9edf45a324
Merge branch 'master' into migration
2012-04-07 17:31:30 +00:00
Tom Needham
d2886f2020
Hide instance import as it eats data
2012-04-07 17:27:09 +00:00
Tom Needham
00449cdf37
rename admin_export -> admin_migrate
2012-04-07 17:23:25 +00:00
Tom Needham
23d39f7ef0
Display errors on import
2012-04-07 16:13:18 +00:00
Thomas Tanghus
d1ae6512cc
Contacts: Misc. cleanup tweaks.
2012-04-07 16:03:43 +02:00
Thomas Tanghus
b71cf1a4f9
Fix bug oc-413: PHP fatal error in contacts page when no contacts in ownCloud.
2012-04-07 16:03:43 +02:00
Tom Needham
660951dc64
Add some filetypes
2012-04-07 13:32:00 +00:00
Tom Needham
a098c7c685
Give editor focus after saving
2012-04-06 21:38:38 +00:00
Tom Needham
22466010fc
Provide undo when closing editor with unsaved changes
2012-04-06 21:37:28 +00:00
Tom Needham
2fe0716cb4
Show nice errors
2012-04-06 20:52:41 +00:00
Arthur Schiwon
60e3b563e2
webdav needs to load authentication apps
2012-04-04 12:41:32 +02:00
Thomas Tanghus
dd4e577f6d
Contacts: l11n for geo autocomplete. Not sure if it works though.
2012-04-03 08:13:10 +02:00
Thomas Tanghus
fc555b48ec
Contacts: Added autocomplete using geonames.org.
2012-04-03 07:29:47 +02:00
Thomas Tanghus
b3f107ddda
Contacts: First work on cleaner design.
2012-04-03 03:29:12 +02:00
Thomas Tanghus
896bff5748
Contacts: rescan categories on load if there are none.
2012-04-03 03:29:12 +02:00
Florian Hülsmann
bd9fa658de
merged from upstream
2012-04-02 23:54:18 +02:00
Tom Needham
adc9d906e4
confirm close when there are unsaved changes
2012-04-02 17:44:15 +00:00
Tom Needham
dc499c5b4e
add * to filename when changes have been made
2012-04-02 17:27:06 +00:00
Tom Needham
d0cb99e347
use OC_Dialogs instead of alert()
2012-04-02 16:35:11 +00:00
Florian Hülsmann
33c1fa6e28
webfinger protocol compatible + minor changes
2012-04-02 17:12:52 +02:00
Georg Ehrke
72a43b3929
revert 0fd8b1a044
2012-04-02 08:32:27 -04:00
Scott Shambarger
d896c19011
cal import should group events by uid, export should have correct newlines, fix for oc-384
2012-03-31 20:16:42 -07:00
Tom Needham
eba6a65908
try to use transactions to replace db
2012-04-01 00:25:47 +00:00
Tom Needham
a248cc73e6
Merge branch 'master' into migration
2012-03-31 23:56:16 +00:00
Tom Needham
daf742c086
Fix owncloud log
2012-03-31 23:55:41 +00:00
Tom Needham
3e84d85482
remove debug
2012-03-31 22:50:57 +00:00
Tom Needham
aba3182a7d
Fix loading image after export failure
2012-03-31 22:47:38 +00:00
Tom Needham
f7d8a8c571
Merge branch 'master' into migration
2012-03-31 22:44:50 +00:00
Tom Needham
d20eea9761
Use ajax to download file, OC_Dialogs for errors
2012-03-31 22:41:43 +00:00
Georg Ehrke
0fd8b1a044
fix events.php for rewritten OC_Caledar_App class
2012-03-31 16:16:34 -04:00
Georg Ehrke
ca2c7001c4
remove unused code in OC_Calendar_App class
2012-03-31 16:15:04 -04:00
Georg Ehrke
70237f7ecc
rewrite OC_Calendar_APP class
2012-03-31 16:13:04 -04:00
Georg Ehrke
10fc51dc92
add public sharing fir calendars and events - add function in Share class
2012-03-31 16:12:27 -04:00
Georg Ehrke
cf26f8a6a7
add public sharing for calendars and events
2012-03-31 17:32:43 +01:00
Georg Ehrke
4b3f074309
add new parameters to export file
2012-03-31 17:27:30 +01:00
Georg Ehrke
1f8cf2d8f2
fix name of constants
2012-03-31 13:37:44 +02:00
Georg Ehrke
a88305b4cb
remove share tab from read only event dialog
2012-03-31 13:11:30 +02:00
Florian Hülsmann
f9f91a08b4
webfinger reimplementation started
2012-03-31 02:42:41 +02:00
Bartek Przybylski
6b704a780d
select field added to oc.dialogs.form, gallery ported to use it
2012-03-30 22:50:57 +02:00
Florian Hülsmann
5161758921
create static host-meta instead of symlink and .htaccess
2012-03-30 21:35:09 +02:00
Bartek Przybylski
6abb2cb92e
fix sharing nested galleries
2012-03-30 21:14:01 +02:00
Georg Ehrke
ef1e359c7c
Merge branch 'master' into sabredav_1.6
2012-03-30 18:48:30 +02:00
Georg Ehrke
e3203f87ff
Merge branch 'master' into calendar_sharing
2012-03-30 18:42:09 +02:00
Jan-Christoph Borchardt
284955573c
clarifying remoteStorage description
2012-03-30 18:18:37 +02:00
Jan-Christoph Borchardt
dde5660915
renamed Gallery to Pictures, still needs to be changed in the code to also reflect in the path
2012-03-30 18:18:37 +02:00
Jan-Christoph Borchardt
011132feb3
renaming remote storage support to External storage support to clear up naming conflict
2012-03-30 18:18:37 +02:00
Robin Appelman
523fdda399
add the option to only load apps of a specific type
2012-03-30 14:39:07 +02:00
Georg Ehrke
90286353e2
Merge branch 'master' into sabredav_1.6
2012-03-29 23:20:03 +02:00
Georg Ehrke
d15959d573
Merge branch 'master' into calendar_sharing
2012-03-29 23:19:31 +02:00
Bartek Przybylski
f74d11c0c3
fix gallery sharing when root is not /
2012-03-29 20:45:21 +02:00
Thomas Tanghus
4b3282b325
Contacts: Removed obsolete code.
2012-03-29 15:36:04 +02:00
Thomas Tanghus
11f7eeb63a
Improve actions on delete.
2012-03-29 15:25:24 +02:00
Thomas Tanghus
b559952806
Cleanup stylesheet.
2012-03-29 15:25:24 +02:00
Michael Gapczynski
5fef9dfc22
Make users only able to share with users in groups they belong to
2012-03-28 21:18:17 -04:00
Robin Appelman
72882beb0d
enble browsing tar files in the web interface
2012-03-28 23:53:51 +02:00
Robin Appelman
1b6fe4f65e
stricter tests for archive backends and make sure we make the tests
2012-03-28 23:47:44 +02:00
Robin Appelman
c26e003462
add tar backend for OC_Archive
...
also handles bz2/gz compression
2012-03-28 23:47:44 +02:00
Robin Appelman
e57de98bbe
add extract all option to OC_Archive
2012-03-28 23:47:44 +02:00
Georg Ehrke
08b4f996d3
add backslash r to the newline var
2012-03-28 17:06:16 +02:00
Georg Ehrke
0d16f177cb
add scrollbar to the music list - bugfix for oc-301
2012-03-28 16:21:54 +02:00
Florian Hülsmann
34a0128ddf
whitespace indentation fix
2012-03-28 16:12:34 +02:00
Florian Hülsmann
bcda46eda3
webfinger installation creates symlink in document root
2012-03-28 16:07:50 +02:00
Tom Needham
bd4fd76bfb
Fix bookmarks migration provider
2012-03-27 21:35:29 +00:00
Tom Needham
ef33219e4f
import method returns each apps' import status
2012-03-27 21:21:14 +00:00
Tom Needham
553f4533c0
look for migrate.php in appinfo folder
2012-03-27 20:45:37 +00:00
Tom Needham
c8acd4a594
Merge branch 'master' into migration
2012-03-27 20:19:38 +00:00
Georg Ehrke
536a3ecb42
Merge branch 'master' into sabredav_1.6
2012-03-27 20:54:16 +02:00
Georg Ehrke
ede0a675bc
Merge branch 'master' into calendar_sharing
2012-03-27 20:53:40 +02:00
Thomas Tanghus
cb2dd97509
Trigger autocomplete wo button.
2012-03-27 12:30:20 +02:00
Thomas Tanghus
fa165498cc
Improvements in adding/deleting properties.
2012-03-27 12:30:20 +02:00
Thomas Tanghus
ff038f8766
Contacts: Update contact list thumbnail when deleting PHOTO.
2012-03-27 12:30:20 +02:00
Georg Ehrke
ff75d65d7e
Merge branch 'master' into calendar_sharing
2012-03-27 09:29:16 +02:00
Georg Ehrke
c384e3ba4f
fix width of dropdown to select monthdays - bugfix oc-354
2012-03-27 09:24:55 +02:00
Robin Appelman
eb3ec05f88
fix gallery scan when an image cant be loaded
2012-03-26 23:56:07 +02:00
Robin Appelman
73c6db5c8e
crop and resize in a single step when creating thumbnail
...
also so more explicit memory cleanup
2012-03-26 23:53:48 +02:00
Robin Appelman
3f881f1ca5
memory cleanup in gallery
2012-03-26 22:40:38 +02:00
Thomas Tanghus
60a939dfcf
Small change and muting debug.
2012-03-26 22:26:06 +02:00
Thomas Tanghus
0da988a1bb
Check for empty value.
...
Added missing classes on action icons.
2012-03-26 22:08:03 +02:00
Bart Visscher
ee31bc7995
Contacts: Fix saveproperty for categories
2012-03-26 21:47:37 +02:00
Georg Ehrke
a867bcab46
Merge branch 'master' into calendar_sharing
2012-03-26 21:46:40 +02:00
Thomas Tanghus
6ff89dcf72
Removed obsolete code.
2012-03-26 19:13:48 +02:00
Georg Ehrke
f479105f5e
optimize choosecalendar dialog for shared calendars
2012-03-26 16:01:55 +02:00
Georg Ehrke
10ef01b04b
fix displayed username of person who shares
2012-03-26 15:44:24 +02:00
Georg Ehrke
8b9d439841
Calendar: fix address for import file
2012-03-26 15:37:47 +02:00
Georg Ehrke
179bf15daf
fix group sql generator in calendar's share lib
2012-03-26 15:30:04 +02:00
Georg Ehrke
71b32f7ad4
add read only 'form' for shared events
2012-03-26 15:24:43 +02:00
Georg Ehrke
96dd008f5e
Merge branch 'master' into calendar_sharing
2012-03-26 09:50:39 +02:00
Georg Ehrke
b7a5ae38c5
fix sql command in calendar's share lib
2012-03-26 09:48:58 +02:00
Thomas Tanghus
102cf150b3
Fixed error in OC_Contacts_VCard::addFromDAVData as pointed out by Guillaume ZITTA
2012-03-26 02:04:34 +02:00
Georg Ehrke
ac0c5ba6da
Merge branch 'master' into sabredav_1.6
2012-03-25 14:02:40 +02:00
Georg Ehrke
19c101a660
fix merge conflicts
2012-03-25 14:02:02 +02:00
Michael Gapczynski
34c08b3165
Add test for Google Docs storage backend, tester needs to token and token secret to config
2012-03-24 15:46:28 -04:00
Michael Gapczynski
d139e3c3cd
Move Google Docs storage backend to files_remote app
2012-03-24 15:28:05 -04:00
Bartek Przybylski
c23090b43c
spaces to tabs in bookmarks
2012-03-24 19:55:44 +01:00
Bartek Przybylski
a3125f164e
bookmarks tag placement & list width fix
2012-03-24 19:55:43 +01:00
Bartek Przybylski
826cb2c650
fix sharing address construction in opera and firefox
2012-03-24 19:26:53 +01:00
Bartek Przybylski
be60b451eb
fix albums thumbnails preview for opera
2012-03-24 19:21:36 +01:00
Bartek Przybylski
afcf965498
fixup: sharing gallery for loggedin users fail
2012-03-24 18:40:27 +01:00
Bartek Przybylski
cbdcb68c2b
gallery sharing, experimental version
2012-03-24 18:35:42 +01:00
Robin Appelman
e0cbefc727
webdav storage backend
2012-03-23 18:55:26 +01:00
Georg Ehrke
0e11cc9f6f
fix previous made bug and fix oc bug - oc-139
2012-03-23 17:27:52 +01:00
Georg Ehrke
ac8362e34a
check if the title of an event is null - bugfix for oc-139
2012-03-23 17:09:51 +01:00
Georg Ehrke
b63b377c4d
Bookmarks: make link text click clickable too - bugfix for oc-131
2012-03-23 16:58:48 +01:00
Georg Ehrke
45b320d674
use unnamed as title for a bookmark if no title was entered and curl fails
2012-03-23 16:54:15 +01:00
Georg Ehrke
37963fee28
Merge branch 'master' into calendar_sharing
2012-03-22 20:40:20 +01:00
Georg Ehrke
8e8c4a8edc
Merge branch 'master' into sabredav_1.6
2012-03-22 20:40:04 +01:00
Robin Appelman
82b54938e3
ftp storage backend
2012-03-22 19:56:19 +01:00
Georg Ehrke
5b03de9a66
fix comments in crypt lib
2012-03-21 17:43:09 +01:00
Tom Needham
892343c7c1
Fix instance import
2012-03-21 16:30:59 +00:00
Georg Ehrke
61166c1002
Merge branch 'master' into calendar_sharing
2012-03-21 09:43:29 +01:00
Georg Ehrke
8f8d486f35
Merge branch 'master' into sabredav_1.6
2012-03-21 09:42:53 +01:00
Tom Needham
07d7138df0
Register admin pane
2012-03-20 20:34:20 +00:00
Tom Needham
0fa5e196ef
Try to use old uid when importing
2012-03-20 20:32:01 +00:00
Tom Needham
514c9ad8e7
Added unified import method.
2012-03-20 20:19:21 +00:00
Georg Ehrke
19bbb61b20
fix spelling fail in texteditor's style.css
2012-03-20 19:48:08 +01:00
Tom Needham
145d6f3566
Add OC_Migration_Content class to help app devs. Restructure OC_Migrate.
2012-03-19 20:44:20 +00:00