Michael Gapczynski
|
349923c5b8
|
Merge branch 'master' of gitorious.org:owncloud/owncloud
|
2011-12-28 12:48:08 -05:00 |
|
Michael Gapczynski
|
9b59bf40df
|
Fix encoding again and update the link after renaming files
|
2011-12-28 12:47:27 -05:00 |
Bart Visscher
|
16e4e6dcc3
|
Contacts: small merge cleanups
|
2011-12-27 22:44:52 +01:00 |
|
Bart Visscher
|
3e2e5196d2
|
Merge branch 'tanghus_remote_backup' of git://gitorious.org/~tanghus/owncloud/tanghus-owncloud
Conflicts:
apps/calendar/export.php
apps/contacts/index.php
|
2011-12-27 22:18:01 +01:00 |
|
Bart Visscher
|
5fd595c0bf
|
Calendar: add loading indicator
|
2011-12-27 21:50:31 +01:00 |
|
Michael Gapczynski
|
1cddfe8820
|
Keep the urls pretty, decode forward slashes
|
2011-12-27 12:43:58 -05:00 |
|
Michael Gapczynski
|
95b9f4ed23
|
Fix folder names with + characters in it
|
2011-12-27 12:35:29 -05:00 |
Robin Appelman
|
5bff1c8ad1
|
some coding style fixes for the pdf viewer
|
2011-12-27 14:19:07 +01:00 |
|
Robin Appelman
|
f009ede753
|
some styling changes for the pdf viewer
|
2011-12-27 14:09:22 +01:00 |
|
Robin Appelman
|
1efb4a0c61
|
remove debug messages in console
|
2011-12-27 13:41:22 +01:00 |
Bartek Przybylski
|
f7674d06d3
|
pdf viewer from Google Code-In program
|
2011-12-27 12:36:51 +01:00 |
|
Bartek Przybylski
|
524aaf0e5e
|
Merge branch 'gallery'
|
2011-12-27 12:34:32 +01:00 |
|
Robin Appelman
|
1fe55b6656
|
fix upload error reporting
|
2011-12-23 19:49:02 +01:00 |
|
Michael Gapczynski
|
9bb004963b
|
Fix whitespace folder name
|
2011-12-23 12:28:44 -05:00 |
|
Bartek Przybylski
|
1383cb51e7
|
removing and renaming albums
|
2011-12-21 21:55:52 +01:00 |
|
Bartek Przybylski
|
6a1a7fcd26
|
merged with stash
|
2011-12-21 18:40:43 +01:00 |
|
Bartek Przybylski
|
25fa9bf8ec
|
merged with stash
|
2011-12-21 18:37:17 +01:00 |
|
Bartek Przybylski
|
3c42867109
|
merged
|
2011-12-21 18:35:29 +01:00 |
|
Bart Visscher
|
e1b9b65e41
|
Use correct appid for lostpassword email preference
|
2011-12-18 23:10:43 +01:00 |
|
Bart Visscher
|
d5e9c7d572
|
Gallery: fix calculation of folder thumbnail selection
|
2011-12-18 23:10:43 +01:00 |
|
Bart Visscher
|
fbad1da9e2
|
Contacts: check if PREF parameter is set before useing it
|
2011-12-18 23:10:43 +01:00 |
|
Bart Visscher
|
dff9585f64
|
Contacts: add missing property_options template var
|
2011-12-18 23:10:43 +01:00 |
|
Bart Visscher
|
ff346ad135
|
Calendar: small for loop fix
|
2011-12-18 23:10:43 +01:00 |
|
Bart Visscher
|
4eb36b0ecf
|
Calendar: refactor common ajax functions to OC_Calendar_App
|
2011-12-18 23:10:42 +01:00 |
|
Robin Appelman
|
3d1accab70
|
add licence file for sabredav
|
2011-12-18 03:45:13 +01:00 |
|
Michael Gapczynski
|
9e50cecf27
|
Fix shared status for files inside a shared folder
|
2011-12-17 21:13:54 -05:00 |
Thomas Tanghus
|
f3e8776dc6
|
Merge git://gitorious.org/owncloud/owncloud into tanghus_remote_backup
|
2011-12-16 17:43:06 +01:00 |
|
Thomas Tanghus
|
feeb0c742a
|
Misc. changes after review by bartv.
|
2011-12-16 17:42:07 +01:00 |
|
Robin Appelman
|
dc641943d9
|
fix some display issues for readonly folders
|
2011-12-16 17:39:15 +01:00 |
|
Robin Appelman
|
65214bed0c
|
make the sharing app return the corrrect result for is_writable on the shared folder
|
2011-12-16 17:31:31 +01:00 |
|
Robin Appelman
|
a862fec9a3
|
make remember login token also dependent on password to protect against some brute force attacks on this token
|
2011-12-14 13:26:34 +01:00 |
|
Thomas Tanghus
|
59ad0a6c9c
|
Update README
|
2011-12-13 10:39:31 +01:00 |
|
Thomas Tanghus
|
ec12dec106
|
Merge git://gitorious.org/owncloud/owncloud into tanghus_remote_backup
|
2011-12-13 10:35:10 +01:00 |
|
Robin Appelman
|
5e711f37ca
|
make filesize parsing case insensitive
|
2011-12-11 23:34:27 +01:00 |
|
Robin Appelman
|
9c6d3a83fd
|
also update the data attribute holding the quota
|
2011-12-11 23:34:20 +01:00 |
|
Robin Appelman
|
ccd9b56609
|
after editing a user quota, set the value of the quota field to how the server parsed the input, not the user input
this way the user can see when an invalid input is given
|
2011-12-11 23:34:13 +01:00 |
|
Thomas Tanghus
|
d55e689261
|
Added readme.tanghus
|
2011-12-11 21:17:10 +01:00 |
|
Thomas Tanghus
|
39430c837f
|
Merge git://gitorious.org/owncloud/owncloud into tanghus_remote_backup
|
2011-12-11 16:29:53 +01:00 |
|
Thomas Tanghus
|
c7b7758816
|
Updating of contact list when activating/adding/deleting address books now works.
|
2011-12-11 16:26:00 +01:00 |
|
Bart Visscher
|
1746cba249
|
Some small changes
|
2011-12-09 22:36:39 +01:00 |
|
Bart Visscher
|
a3cb04013e
|
Update OC_VObject
|
2011-12-09 21:56:03 +01:00 |
|
Bart Visscher
|
2e951c0ce5
|
Gallary: Fix alignment of album thumbnails
|
2011-12-09 21:44:13 +01:00 |
|
Thomas Tanghus
|
5cb10548b3
|
Resolved conflict
|
2011-12-09 15:28:51 +01:00 |
|
Thomas Tanghus
|
7aa8eb3427
|
Merge git://gitorious.org/owncloud/owncloud into tanghus_remote_backup
Conflicts:
apps/contacts/ajax/deletebook.php
apps/contacts/index.php
|
2011-12-09 15:25:26 +01:00 |
|
Thomas Tanghus
|
b3661adf02
|
Various fixes to multiple address books handling
|
2011-12-09 15:10:51 +01:00 |
|
Bart Visscher
|
eeaf539a44
|
Gallery: splitout model code
|
2011-12-08 20:05:12 +01:00 |
Michiel de Jong
|
d4546cdf37
|
bump version number to force db rebuild
|
2011-12-08 17:19:38 +07:00 |
|
Bart Visscher
|
9ba59aee36
|
Sort apps on name and enabled status
|
2011-12-07 20:41:00 +01:00 |
|
Bart Visscher
|
0342b5fc43
|
Fix filename of log icon
|
2011-12-07 20:41:00 +01:00 |
|
Bart Visscher
|
a389d94e2b
|
Imageviewer: fix fancybox.png image url in fancybox css
|
2011-12-07 20:41:00 +01:00 |